Minor fixes to some previous commits.

* Fixed a bug with storing the protocol version.
* Fixed an issue with text windows cancelling.
* Fixed a typo in the source.
This commit is contained in:
BeniS
2013-01-18 03:23:01 +13:00
parent cf77c2baf3
commit b68df8336a
9 changed files with 18 additions and 16 deletions

View File

@@ -109,10 +109,10 @@ void Application::deinit()
g_modules.unloadModules();
g_modules.clear();
// release reamaning lua object references
// release remaining lua object references
g_lua.collectGarbage();
// poll reamaning events
// poll remaining events
poll();
// disable dispatcher events

View File

@@ -45,7 +45,7 @@ void EventDispatcher::poll()
int loops = 0;
for(int count = 0, max = m_scheduledEventList.size(); count < max && !m_scheduledEventList.empty(); ++count) {
ScheduledEventPtr scheduledEvent = m_scheduledEventList.top();
if(scheduledEvent->reamaningTicks() > 0)
if(scheduledEvent->remainingTicks() > 0)
break;
m_scheduledEventList.pop();
scheduledEvent->execute();

View File

@@ -76,7 +76,7 @@ void GraphicalApplication::terminate()
// destroy particles
g_particles.terminate();
// destroy any reamaning widget
// destroy any remaining widget
g_ui.terminate();
Application::terminate();

View File

@@ -35,7 +35,7 @@ public:
bool nextCycle();
int ticks() { return m_ticks; }
int reamaningTicks() { return m_ticks - g_clock.millis(); }
int remainingTicks() { return m_ticks - g_clock.millis(); }
int delay() { return m_delay; }
int cyclesExecuted() { return m_cyclesExecuted; }
int maxCycles() { return m_maxCycles; }

View File

@@ -213,7 +213,7 @@ void Application::registerLuaFunctions()
g_lua.registerClass<ScheduledEvent, Event>();
g_lua.bindClassMemberFunction<ScheduledEvent>("nextCycle", &ScheduledEvent::nextCycle);
g_lua.bindClassMemberFunction<ScheduledEvent>("ticks", &ScheduledEvent::ticks);
g_lua.bindClassMemberFunction<ScheduledEvent>("reamaningTicks", &ScheduledEvent::reamaningTicks);
g_lua.bindClassMemberFunction<ScheduledEvent>("remainingTicks", &ScheduledEvent::remainingTicks);
g_lua.bindClassMemberFunction<ScheduledEvent>("delay", &ScheduledEvent::delay);
g_lua.bindClassMemberFunction<ScheduledEvent>("cyclesExecuted", &ScheduledEvent::cyclesExecuted);
g_lua.bindClassMemberFunction<ScheduledEvent>("maxCycles", &ScheduledEvent::maxCycles);

View File

@@ -110,11 +110,11 @@ void Protocol::internalRecvHeader(uint8* buffer, uint16 size)
{
// read message size
m_inputMessage->fillBuffer(buffer, size);
uint16 reamaningSize = m_inputMessage->readSize();
uint16 remainingSize = m_inputMessage->readSize();
// read reamaning message data
// read remaining message data
if(m_connection)
m_connection->read(reamaningSize, std::bind(&Protocol::internalRecvData, asProtocol(), std::placeholders::_1, std::placeholders::_2));
m_connection->read(remainingSize, std::bind(&Protocol::internalRecvData, asProtocol(), std::placeholders::_1, std::placeholders::_2));
}
void Protocol::internalRecvData(uint8* buffer, uint16 size)