ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid infinite loop when showing the in-race menu and a rollback happens.

Browse Source
This commit is contained in:
hiker
2017-01-04 09:51:36 +11:00
parent 6941317979
commit 2be59e7728
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/race_event_manager.cpp
View File

@@ -30,8 +30,11 @@ void RaceEventManager::update(float dt)
if(!ProtocolManager::getInstance())
return;
// Replay all recorded events up to the current time:
RewindManager::get()->playEventsTill(World::getWorld()->getTime());
// Replay all recorded events up to the current time (only if the
// timer isn't stopped, otherwise a potential rewind will trigger
// an infinite loop since world time does not increase)
if(World::getWorld()->getPhase()!=WorldStatus::IN_GAME_MENU_PHASE)
RewindManager::get()->playEventsTill(World::getWorld()->getTime());
World::getWorld()->updateWorld(dt);