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

quick hack around the teamchat crash in lobby

Browse Source
This commit is contained in:
Chris Forbes
2010-10-12 21:19:27 +13:00
parent 6b6c9639f9
commit 7c31f72db6
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,15 +47,18 @@ namespace OpenRA.Network
var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
if (client != null)
{
var player = world.FindPlayerByClientId(clientId);
var display = player != null
&& (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally
|| player.WinState == WinState.Lost);
if (display)
if (world != null) // TODO: fix this whole thing properly. this is BS.
{
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
var player = world.FindPlayerByClientId(clientId);
var display = player != null
&& (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally
|| player.WinState == WinState.Lost);
if (display)
{
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
}
}
}
break;