Add some more robustness against UI-introduced desyncs.

This commit is contained in:
Paul Chote
2014-03-13 09:40:41 +13:00
committed by Matthias Mailänder
parent 0d6517ec25
commit c21b27cddb

View File

@@ -167,15 +167,15 @@ namespace OpenRA
{ {
var tick = Environment.TickCount; var tick = Environment.TickCount;
var world = orderManager.world;
var uiTickDelta = tick - Ui.LastTickTime; var uiTickDelta = tick - Ui.LastTickTime;
if (uiTickDelta >= Timestep) if (uiTickDelta >= Timestep)
{ {
Ui.LastTickTime += Timestep; Ui.LastTickTime += Timestep;
Ui.Tick(); Sync.CheckSyncUnchanged(world, Ui.Tick);
cursorFrame += 0.5f; cursorFrame += 0.5f;
} }
var world = orderManager.world;
var worldTimestep = world == null ? Timestep : world.Timestep; var worldTimestep = world == null ? Timestep : world.Timestep;
var worldTickDelta = (tick - orderManager.LastTickTime); var worldTickDelta = (tick - orderManager.LastTickTime);
if (worldTimestep != 0 && worldTickDelta >= worldTimestep) if (worldTimestep != 0 && worldTickDelta >= worldTimestep)