epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "Show Shellmap" setting.

Browse Source
This commit is contained in:
Paul Chote
2016-12-10 18:02:00 +00:00
parent 55f76c02d6
commit a16344d347
9 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenRA.Game/Game.cs
View File

@@ -533,38 +533,32 @@ namespace OpenRA
if (world == null)
return;
// Don't tick when the shellmap is disabled
if (world.ShouldTick)
var isNetTick = LocalTick % NetTickScale == 0;
if (!isNetTick || orderManager.IsReadyForNextFrame)
{
var isNetTick = LocalTick % NetTickScale == 0;
++orderManager.LocalFrameNumber;
if (!isNetTick || orderManager.IsReadyForNextFrame)
Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
if (BenchmarkMode)
Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
if (isNetTick)
orderManager.Tick();
Sync.CheckSyncUnchanged(world, () =>
{
++orderManager.LocalFrameNumber;
world.OrderGenerator.Tick(world);
world.Selection.Tick(world);
});
Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
world.Tick();
if (BenchmarkMode)
Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
if (isNetTick)
orderManager.Tick();
Sync.CheckSyncUnchanged(world, () =>
{
world.OrderGenerator.Tick(world);
world.Selection.Tick(world);
});
world.Tick();
PerfHistory.Tick();
}
else if (orderManager.NetFrameNumber == 0)
orderManager.LastTickTime = RunTime;
}
else
PerfHistory.Tick();
}
else if (orderManager.NetFrameNumber == 0)
orderManager.LastTickTime = RunTime;
// Wait until we have done our first world Tick before TickRendering
if (orderManager.LocalFrameNumber > 0)