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

Merge pull request #9639 from abcdefg30/specchat

Browse Source 
Add team chat for spectators
This commit is contained in:
Oliver Brakmann
2015-12-01 22:32:57 +01:00
parent 5174da6d93 cd62873003
commit fd2bd7c9d3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,19 +76,18 @@ 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, client.Name + " (Team)", order.TargetString);
}
else
{
var player = world.FindPlayerByClient(client);
if (player == null) return;
if ((world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) || player.WinState == WinState.Lost)
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);
}
else if (orderManager.LocalClient != null && orderManager.LocalClient.IsObserver && client.IsObserver)
Game.AddChatLine(client.Color.RGB, client.Name + " (Spectators)", order.TargetString);
}
}