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

Revert "new PauseState to differentiate game and editor pausing"

Browse Source 
This reverts commit d1e18cad7a.
This commit is contained in:
Paul Chote
2014-07-08 10:40:23 +12:00
parent 18c9a25232
commit 802b6a652c
10 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/World.cs
View File

@@ -203,9 +203,8 @@ namespace OpenRA
public event Action<Actor> ActorAdded = _ => { };
public event Action<Actor> ActorRemoved = _ => { };
public enum PauseState { Active, Paused, Editor }
public PauseState Paused { get; internal set; }
public PauseState PredictedPaused { get; internal set; }
public bool Paused { get; internal set; }
public bool PredictedPaused { get; internal set; }
public bool PauseStateLocked { get; set; }
public bool IsShellmap = false;
public int WorldTick { get; private set; }
@@ -216,17 +215,17 @@ namespace OpenRA
return;
IssueOrder(Order.PauseGame(paused));
PredictedPaused = paused ? PauseState.Paused : PauseState.Active;;
PredictedPaused = paused;
}
public void SetLocalPauseState(PauseState paused)
public void SetLocalPauseState(bool paused)
{
Paused = PredictedPaused = paused;
}
public void Tick()
{
if (Paused != PauseState.Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
{
WorldTick++;