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

In case of history replay update dt earlier so that World is updated

Browse Source 
with the replay dt value.
This commit is contained in:
hiker 2016-09-21 17:31:24 +10:00
parent 15660f2d7a
commit 1651d28a4c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modes/world.cpp
View File

@ -991,6 +991,11 @@ void World::update(float dt)
assert(m_magic_number == 0xB01D6543); assert(m_magic_number == 0xB01D6543);
#endif #endif
history->update(dt);
if (history->replayHistory())
{
dt = history->getNextDelta();
}
PROFILER_PUSH_CPU_MARKER("World::update()", 0x00, 0x7F, 0x00); PROFILER_PUSH_CPU_MARKER("World::update()", 0x00, 0x7F, 0x00);
@ -1004,8 +1009,10 @@ void World::update(float dt)
} }
#endif #endif
PROFILER_PUSH_CPU_MARKER("World::update (sub-updates)", 0x20, 0x7F, 0x00);
WorldStatus::update(dt); WorldStatus::update(dt);
RewindManager::get()->saveStates(); RewindManager::get()->saveStates();
PROFILER_POP_CPU_MARKER();
PROFILER_PUSH_CPU_MARKER("World::update (Kart::upate)", 0x40, 0x7F, 0x00); PROFILER_PUSH_CPU_MARKER("World::update (Kart::upate)", 0x40, 0x7F, 0x00);
@ -1027,12 +1034,8 @@ void World::update(float dt)
} }
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
PROFILER_PUSH_CPU_MARKER("World::update (sub-updates)", 0x20, 0x7F, 0x00);
history->update(dt);
if(race_manager->isRecordingRace()) ReplayRecorder::get()->update(dt); if(race_manager->isRecordingRace()) ReplayRecorder::get()->update(dt);
if(history->replayHistory()) dt=history->getNextDelta();
if (m_script_engine) m_script_engine->update(dt); if (m_script_engine) m_script_engine->update(dt);
PROFILER_POP_CPU_MARKER();
if (!history->dontDoPhysics()) if (!history->dontDoPhysics())
{ {