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

Avoid issue that when rewinding the latest state is skipped (so

Browse Source 
it rewinds from an even earlier state).
This commit is contained in:
hiker 2018-04-10 00:32:12 +10:00
parent 9eadd2e64d
commit cca7563bec
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/network/rewind_queue.cpp
View File

@ -288,28 +288,19 @@ bool RewindQueue::hasMoreRewindInfo() const
*/
int RewindQueue::undoUntil(int undo_ticks)
{
// m_current points to the next not yet executed event (or state)
// or end() if nothing else is in the queue
if (m_current != m_all_rewind_info.begin())
m_current--;
do
// A rewind is done after a state in the past is inserted. This function
// makes sure that m_current is not end()
assert(m_current != m_all_rewind_info.end());
while((*m_current)->getTicks() > undo_ticks ||
(*m_current)->isEvent() || !(*m_current)->isConfirmed())
{
// Undo all events and states from the current time
(*m_current)->undo();
if ( (*m_current)->getTicks() <= undo_ticks &&
(*m_current)->isState() && (*m_current)->isConfirmed() )
{
return (*m_current)->getTicks();
}
m_current--;
} while (m_current != m_all_rewind_info.end());
}
// Shouldn't happen
Log::error("RewindManager", "No state for rewind to %d",
undo_ticks);
return -1;
return (*m_current)->getTicks();
} // undoUntil
// ----------------------------------------------------------------------------