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

Fix the handling of messages that arrive before the last saved state

Browse Source 
(which currently causes a crash).
This commit is contained in:
hiker 2018-04-22 22:07:21 +10:00
parent 78f96d4818
commit 8e1f046b86
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/rewind_queue.cpp
View File

@ -225,6 +225,20 @@ void RewindQueue::mergeNetworkData(int world_ticks, bool *needs_rewind,
i++;
continue;
}
// Any state of event that is received before the latest confirmed
// state can be deleted.
if ((*i)->getTicks() < m_latest_confirmed_state_time)
{
Log::info("RewindQueue",
"Deleting %s at %d because it's before confirmed state %d",
(*i)->isEvent() ? "event" : "state",
(*i)->getTicks(),
m_latest_confirmed_state_time);
delete *i;
i = m_network_events.getData().erase(i);
continue;
}
// A server never rewinds (otherwise we would have to handle
// duplicated states, which in the best case would then have
// a negative effect for every player, when in fact only one
@ -276,6 +290,7 @@ void RewindQueue::mergeNetworkData(int world_ticks, bool *needs_rewind,
if (latest_confirmed_state > m_latest_confirmed_state_time)
{
cleanupOldRewindInfo(latest_confirmed_state);
m_latest_confirmed_state_time = latest_confirmed_state;
}
} // mergeNetworkData