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

Merge pull request #3238 from pchote/local-pause-state

Browse Source 
Remove local pause order lag delay
This commit is contained in:
Matthias Mailänder
2013-05-10 03:07:08 -07:00
parent 16decbf02b c3c5321e1d
commit 90dc6d3298
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -109,6 +109,7 @@ namespace OpenRA.Network
}
orderManager.world.Paused = pause;
orderManager.world.PredictedPaused = pause;
}
break;
}

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -175,7 +175,7 @@ namespace OpenRA.Widgets
return true;
}
else if (e.KeyName == Game.Settings.Keys.PauseKey)
world.IssueOrder(Order.PauseGame(!world.Paused));
world.SetPauseState(!world.Paused);
}
return false;
}

9
OpenRA.Game/World.cs
View File

@@ -177,9 +177,16 @@ namespace OpenRA
public event Action<Actor> ActorAdded = _ => { };
public event Action<Actor> ActorRemoved = _ => { };
public bool Paused = false;
public bool Paused { get; internal set; }
public bool PredictedPaused { get; internal set; }
public bool IsShellmap = false;
public void SetPauseState(bool paused)
{
IssueOrder(Order.PauseGame(paused));
PredictedPaused = paused;
}
public void Tick()
{
if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))