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

If more than one state arrived in one timestep for a client, rewind

Browse Source 
to the latest one (not the earliest).
This commit is contained in:
hiker 2017-11-28 17:26:00 +11:00
parent 0b6e793df6
commit efde9ac501
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/rewind_queue.cpp
View File

@ -254,9 +254,10 @@ void RewindQueue::mergeNetworkData(float world_time, float dt,
return; return;
} }
/* Merge all newly received network events into the main event list. */ // Merge all newly received network events into the main event list.
// Only a client ever rewinds. So the rewind time should be the latest
*rewind_time = 99999.9f; // received state before current world time (if any)
*rewind_time = -99999.9f;
bool adjust_next = false; bool adjust_next = false;
// FIXME: making m_network_events sorted would prevent the need to // FIXME: making m_network_events sorted would prevent the need to
@ -279,7 +280,7 @@ void RewindQueue::mergeNetworkData(float world_time, float dt,
Log::warn("RewindQueue", "At %f received message from %f", Log::warn("RewindQueue", "At %f received message from %f",
world_time, (*i)->getTime()); world_time, (*i)->getTime());
// Server received an event in the past. Adjust this event // Server received an event in the past. Adjust this event
// to be done now - at least we get a bit closer to the // to be executed now - at least we get a bit closer to the
// client state. // client state.
(*i)->setTime(world_time); (*i)->setTime(world_time);
} }
@ -312,13 +313,15 @@ void RewindQueue::mergeNetworkData(float world_time, float dt,
(*prev)->getTime(), (*prev)->getTime(),
next != m_time_step_info.end() ? (*next)->getTime() : 9999 ); next != m_time_step_info.end() ? (*next)->getTime() : 9999 );
// Check if a rewind is necessary: either an message arrived in the past
// Check if a rewind is necessary // or if the time is between world_time and world_time+dt (otherwise
// the message would have been ignored further up), 'rewind' to this new
// state anyway
if (tsi->getTime() < world_time || if (tsi->getTime() < world_time ||
(*i)->isState() && tsi == m_time_step_info.back()) (*i)->isState() && tsi == m_time_step_info.back())
{ {
*needs_rewind = true; *needs_rewind = true;
if (tsi->getTime() < *rewind_time) *rewind_time = tsi->getTime(); if (tsi->getTime() > *rewind_time) *rewind_time = tsi->getTime();
} }
i = m_network_events.getData().erase(i); i = m_network_events.getData().erase(i);
} // for i in m_network_events } // for i in m_network_events