Merge pull request #2991 from pchote/sane-pause-logic

Fix pause logic and C&C cheats menu
2013-04-08 02:35:25 -07:00
parent 0cf4c7ccb9 3968609a1e
commit c421399e45
27 changed files with 302 additions and 233 deletions
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -488,11 +488,9 @@ namespace OpenRA.Server
 						DispatchOrdersToClient(c, fromIndex, 0, so.Serialize());
 					break;
 				
-				case "PauseRequest":
-					foreach (var c in conns.ToArray())
-					{  var x = Order.PauseGame();
-						DispatchOrdersToClient(c, fromIndex, 0, x.Serialize());
-					}
+				case "PauseGame":
+					foreach (var c in conns.Except(conn).ToArray())
+						DispatchOrdersToClient(c, fromIndex, 0, so.Serialize());
 					break;
 			}
 		}