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

Merge pull request #13050 from rob-v/DefeatedPlayersCanNotPauseGame

Browse Source 
Lost players except Host can not pause game #12227
This commit is contained in:
abcdefg30
2017-04-18 17:00:04 +02:00
committed by GitHub
parent 8e6f6a3a52 a11ff104a2
commit 23ba3cfcb6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Commands/PlayerCommands.cs
View File

@@ -35,19 +35,20 @@ namespace OpenRA.Mods.Common.Commands
public void InvokeCommand(string name, string arg) public void InvokeCommand(string name, string arg)
{ {
if (world.LocalPlayer == null)
return;
switch (name) switch (name)
{ {
case "pause": case "pause":
if (Game.IsHost || (world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Lost))
world.IssueOrder(new Order("PauseGame", null, false) world.IssueOrder(new Order("PauseGame", null, false)
{ {
TargetString = world.Paused ? "UnPause" : "Pause" TargetString = world.Paused ? "UnPause" : "Pause"
}); });
break; break;
case "surrender": case "surrender":
if (world.LocalPlayer != null)
world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false)); world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));
break; break;
} }
} }

3
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -241,7 +241,8 @@ namespace OpenRA.Mods.Common.Widgets
{ {
var key = Hotkey.FromKeyInput(e); var key = Hotkey.FromKeyInput(e);
if (key == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators if (key == Game.Settings.Keys.PauseKey
&& (Game.IsHost || (World.LocalPlayer != null && World.LocalPlayer.WinState != WinState.Lost))) // Disable pausing for spectators and defeated players
World.SetPauseState(!World.Paused); World.SetPauseState(!World.Paused);
else if (key == Game.Settings.Keys.SelectAllUnitsKey && !World.IsGameOver) else if (key == Game.Settings.Keys.SelectAllUnitsKey && !World.IsGameOver)
{ {