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

Merge pull request #11084 from cjshmyr/chatprefix

Browse Source 
Move Spectators & Team chat labels before player nickname
This commit is contained in:
Matthias Mailänder
2016-04-18 15:23:17 +02:00
parent 6323f763f1 6a492035fc
commit 6f151d8096
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,18 +77,17 @@ namespace OpenRA.Network
if (world == null) if (world == null)
{ {
if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team) 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 else
{ {
var player = world.FindPlayerByClient(client); var player = world.FindPlayerByClient(client);
if (player != null && ((world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) || player.WinState == WinState.Lost)) if (player != null && player.WinState == WinState.Lost)
{ Game.AddChatLine(client.Color.RGB, client.Name + " (Dead)", order.TargetString);
var suffix = player.WinState == WinState.Lost ? " (Dead)" : " (Team)"; else if (player != null && world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally)
Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString); Game.AddChatLine(client.Color.RGB, "[Team] " + client.Name, order.TargetString);
}
else if (orderManager.LocalClient != null && orderManager.LocalClient.IsObserver && client.IsObserver) 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);
} }
} }