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

Merge pull request #10089 from abcdefg30/shellmapCPU

Browse Source 
Try to win a small amount of performance when the shellmap is disabled
This commit is contained in:
Matthias Mailänder
2015-12-31 12:22:14 +01:00
parent 9e5d325a25 76d88e5ae4
commit 6a555a7a8d
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Game.cs
View File

@@ -491,7 +491,11 @@ namespace OpenRA
Sound.Tick();
Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
if (world != null)
if (world == null)
return;
// Don't tick when the shellmap is disabled
if (world.ShouldTick)
{
var isNetTick = LocalTick % NetTickScale == 0;
@@ -517,12 +521,13 @@ namespace OpenRA
PerfHistory.Tick();
}
else
if (orderManager.NetFrameNumber == 0)
orderManager.LastTickTime = RunTime;
else if (orderManager.NetFrameNumber == 0)
orderManager.LastTickTime = RunTime;
Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
}
else
PerfHistory.Tick();
}
}
}

3
OpenRA.Game/World.cs
View File

@@ -262,6 +262,7 @@ namespace OpenRA
public event Action<Actor> ActorAdded = _ => { };
public event Action<Actor> ActorRemoved = _ => { };
public bool ShouldTick { get { return Type != WorldType.Shellmap || Game.Settings.Game.ShowShellmap; } }
public bool Paused { get; internal set; }
public bool PredictedPaused { get; internal set; }
public bool PauseStateLocked { get; set; }
@@ -284,7 +285,7 @@ namespace OpenRA
public void Tick()
{
if (!Paused && (Type != WorldType.Shellmap || Game.Settings.Game.ShowShellmap))
if (!Paused)
{
WorldTick++;