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

Merge pull request #7894 from obrakmann/fix_7890_7893

Browse Source 
Fix issues in latest playtest
This commit is contained in:
Pavel Penev
2015-04-07 14:52:51 -07:00
parent 5ddce9a197 197f60b2a5
commit 66e8545eaa
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace OpenRA.Network
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : ""; var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
suffix = client.IsObserver ? " (Spectator)" : suffix; suffix = client.IsObserver ? " (Spectator)" : suffix;
if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team == orderManager.LocalClient.Team) if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team)
suffix += " (Ally)"; suffix += " (Ally)";
Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString); Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString);

15
OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs
View File

@@ -336,22 +336,25 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (game.State == (int)ServerState.GameStarted) if (game.State == (int)ServerState.GameStarted)
{ {
var label = "";
try try
{ {
var runTime = DateTime.Now - System.DateTime.Parse(game.Started); var runTime = DateTime.Now - System.DateTime.Parse(game.Started);
return "In progress for {0} minute{1}".F(runTime.Minutes, runTime.Minutes > 1 ? "s" : ""); label = "In progress for {0} minute{1}".F(runTime.Minutes, runTime.Minutes > 1 ? "s" : "");
} }
catch (Exception) catch (Exception)
{ {
return "In progress"; label = "In progress";
}
} }
if (game.Protected) return game.Protected ? label + " (Password protected)" : label;
return "Password protected"; }
if (game.State == (int)ServerState.WaitingPlayers) if (game.State == (int)ServerState.WaitingPlayers)
return "Waiting for players"; {
var label = "Waiting for players";
return game.Protected ? label + " (Password protected)" : label;
}
if (game.State == (int)ServerState.ShuttingDown) if (game.State == (int)ServerState.ShuttingDown)
return "Server shutting down"; return "Server shutting down";