From 6a492035fc76f7d964c4a7c629339289d9690bb3 Mon Sep 17 00:00:00 2001 From: Curtis Shmyr Date: Sat, 9 Apr 2016 16:37:35 -0600 Subject: [PATCH] Move Spectators and Team chat labels before nicknames --- OpenRA.Game/Network/UnitOrders.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index 714af7db8b..790a6a4838 100644 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -77,18 +77,17 @@ namespace OpenRA.Network if (world == null) { if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team) - Game.AddChatLine(client.Color.RGB, client.Name + " (Team)", order.TargetString); + Game.AddChatLine(client.Color.RGB, "[Team] " + client.Name, order.TargetString); } else { var player = world.FindPlayerByClient(client); - if (player != null && ((world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) || player.WinState == WinState.Lost)) - { - var suffix = player.WinState == WinState.Lost ? " (Dead)" : " (Team)"; - Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString); - } + if (player != null && player.WinState == WinState.Lost) + Game.AddChatLine(client.Color.RGB, client.Name + " (Dead)", order.TargetString); + else if (player != null && world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) + Game.AddChatLine(client.Color.RGB, "[Team] " + client.Name, order.TargetString); else if (orderManager.LocalClient != null && orderManager.LocalClient.IsObserver && client.IsObserver) - Game.AddChatLine(client.Color.RGB, client.Name + " (Spectators)", order.TargetString); + Game.AddChatLine(client.Color.RGB, "[Spectators] " + client.Name, order.TargetString); } }