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

Bugfix: loop did not test if there were RewindInfo available; simplified

Browse Source 
loop as well.
This commit is contained in:
hiker
2017-01-20 10:46:37 +11:00
parent ef1f48da50
commit 414c51a558
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/network/rewind_manager.cpp
View File

@@ -305,25 +305,24 @@ void RewindManager::rewindTo(float rewind_time)
{
// Now handle all states and events at the current time before
// updating the world:
if (m_rewind_queue.hasMoreRewindInfo())
while (m_rewind_queue.hasMoreRewindInfo())
{
RewindInfo *ri = m_rewind_queue.getNext();
while (ri->getTime() <= world->getTime())
{
if (ri->isState())
{
// TOOD: replace the old state with a new state.
// For now just set it to confirmed
ri->setConfirmed(true);
}
else if (ri->isEvent())
{
ri->rewind();
}
if (ri->getTime() > world->getTime()) break;
++m_rewind_queue;
} // while ri->getTime() <= world->getTime()
} // if m_rewind_queue.hasMoreRewindInfo()
if (ri->isState())
{
// TOOD: replace the old state with a new state.
// For now just set it to confirmed
ri->setConfirmed(true);
}
else if (ri->isEvent())
{
ri->rewind();
}
++m_rewind_queue;
} // while ri->getTime() <= world->getTime()
float dt = m_rewind_queue.determineNextDT(current_time);
world->updateWorld(dt);