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

new PauseState to differentiate game and editor pausing

Browse Source
This commit is contained in:
Matthias Mailänder
2014-07-03 20:47:51 +02:00
parent d580ca6417
commit d1e18cad7a
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/World.cs
View File

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