gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix glitch caused by grounds with speed 1

This commit is contained in:
Eduardo Bart 2012-08-03 04:42:49 -03:00
parent ec1d5aa260
commit 9e917ece88
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/framework/core/eventdispatcher.cpp
View File

@ -42,7 +42,8 @@ void EventDispatcher::shutdown()
void EventDispatcher::poll() void EventDispatcher::poll()
{ {
while(!m_scheduledEventList.empty()) { int loops = 0;
for(int count = 0, max = m_scheduledEventList.size(); count < max && !m_scheduledEventList.empty(); ++count) {
ScheduledEventPtr scheduledEvent = m_scheduledEventList.top(); ScheduledEventPtr scheduledEvent = m_scheduledEventList.top();
if(scheduledEvent->reamaningTicks() > 0) if(scheduledEvent->reamaningTicks() > 0)
break; break;
@ -53,16 +54,14 @@ void EventDispatcher::poll()
m_scheduledEventList.push(scheduledEvent); m_scheduledEventList.push(scheduledEvent);
} }
// execute events list up to 10 times, this is needed because some events can schedule new events that would // execute events list until all events are out, this is needed because some events can schedule new events that would
// change the UIWidgets layout, in this case we must execute these new events before we continue rendering, // change the UIWidgets layout, in this case we must execute these new events before we continue rendering,
// we can't loop until the event list is empty, because this could lead to infinite loops
// if someone write a module with bad code
m_pollEventsSize = m_eventList.size(); m_pollEventsSize = m_eventList.size();
int count = 0; loops = 0;
while(m_pollEventsSize > 0) { while(m_pollEventsSize > 0) {
if(count > 50) { if(loops > 50) {
static Timer reportTimer; static Timer reportTimer;
if(reportTimer.running() && reportTimer.ticksElapsed() > 250) { if(reportTimer.running() && reportTimer.ticksElapsed() > 100) {
g_logger.error("ATTENTION the event list is not getting empty, this could be caused by some bad code"); g_logger.error("ATTENTION the event list is not getting empty, this could be caused by some bad code");
reportTimer.restart(); reportTimer.restart();
} }
@ -75,7 +74,6 @@ void EventDispatcher::poll()
event->execute(); event->execute();
} }
m_pollEventsSize = m_eventList.size(); m_pollEventsSize = m_eventList.size();
count++;
} }
} }

2
src/otclient/creature.cpp
View File

@ -621,6 +621,8 @@ int Creature::getStepDuration()
m_lastStepDirection == Otc::SouthWest || m_lastStepDirection == Otc::SouthEast) m_lastStepDirection == Otc::SouthWest || m_lastStepDirection == Otc::SouthEast)
interval *= 3; interval *= 3;
interval = std::max(interval, g_game.getServerBeat());
return interval; return interval;
} }