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

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

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -102,15 +102,15 @@ namespace OpenRA.Network
var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
if (client != null)
{
var pauseState = order.TargetString == "Pause" ? World.PauseState.Paused : World.PauseState.Active;
if (orderManager.world.Paused != pauseState && !world.LobbyInfo.IsSinglePlayer)
var pause = order.TargetString == "Pause";
if (orderManager.world.Paused != pause && !world.LobbyInfo.IsSinglePlayer)
{
var pausetext = "The game is {0} by {1}.".F(pauseState == World.PauseState.Paused ? "paused" : "un-paused", client.Name);
var pausetext = "The game is {0} by {1}".F(pause ? "paused" : "un-paused", client.Name);
Game.AddChatLine(Color.White, "", pausetext);
}
orderManager.world.Paused = pauseState;
orderManager.world.PredictedPaused = pauseState;
orderManager.world.Paused = pause;
orderManager.world.PredictedPaused = pause;
}
break;
}