tidy in UnitOrders

This commit is contained in:
Chris Forbes
2011-12-23 16:57:24 +13:00
parent 4bcd19f57c
commit bd4345c2d0

View File

@@ -50,6 +50,7 @@ namespace OpenRA.Network
Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString); Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
break; break;
} }
case "Disconnected": /* reports that the target player disconnected */ case "Disconnected": /* reports that the target player disconnected */
{ {
var client = orderManager.LobbyInfo.ClientWithIndex(clientId); var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
@@ -59,6 +60,7 @@ namespace OpenRA.Network
} }
break; break;
} }
case "TeamChat": case "TeamChat":
{ {
var client = orderManager.LobbyInfo.ClientWithIndex(clientId); var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
@@ -74,29 +76,25 @@ namespace OpenRA.Network
else else
{ {
var player = world.FindPlayerByClient(client); var player = world.FindPlayerByClient(client);
var display = player != null if (player == null) return;
&&
(world.LocalPlayer != null &&
player.Stances[world.LocalPlayer] == Stance.Ally
|| player.WinState == WinState.Lost);
if (display) if (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally || player.WinState == WinState.Lost)
{ {
var suffix = (player != null && player.WinState == WinState.Lost) var suffix = player.WinState == WinState.Lost ? " (Dead)" : " (Team)";
? " (Dead)"
: " (Team)";
Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString); Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
} }
} }
} }
break; break;
} }
case "StartGame": case "StartGame":
{ {
Game.AddChatLine(Color.White, "Server", "The game has started."); Game.AddChatLine(Color.White, "Server", "The game has started.");
Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false); Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false);
break; break;
} }
case "HandshakeRequest": case "HandshakeRequest":
{ {
var request = HandshakeRequest.Deserialize(order.TargetString); var request = HandshakeRequest.Deserialize(order.TargetString);
@@ -126,9 +124,11 @@ namespace OpenRA.Network
orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize())); orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
break; break;
} }
case "ServerError": case "ServerError":
orderManager.ServerError = order.TargetString; orderManager.ServerError = order.TargetString;
break; break;
case "SyncInfo": case "SyncInfo":
{ {
orderManager.LobbyInfo = Session.Deserialize(order.TargetString); orderManager.LobbyInfo = Session.Deserialize(order.TargetString);