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

Merge pull request #12974 from rob-v/IngameMessagePrefixes

Browse Source 
Unify ingame message prefixes. #12923
This commit is contained in:
abcdefg30
2017-03-19 23:13:59 +01:00
committed by GitHub
parent ff998fd552 bad2c1c2bf
commit cc67f9328c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ namespace OpenRA.Network
{ {
static class UnitOrders static class UnitOrders
{ {
const string ServerChatName = "Battlefield Control";
static Player FindPlayerByClient(this World world, Session.Client c) static Player FindPlayerByClient(this World world, Session.Client c)
{ {
/* TODO: this is still a hack. /* TODO: this is still a hack.
@@ -57,7 +59,7 @@ namespace OpenRA.Network
} }
case "Message": // Server message case "Message": // Server message
Game.AddChatLine(Color.White, "Server", order.TargetString); Game.AddChatLine(Color.White, ServerChatName, order.TargetString);
break; break;
case "Disconnected": /* reports that the target player disconnected */ case "Disconnected": /* reports that the target player disconnected */
@@ -105,7 +107,7 @@ namespace OpenRA.Network
break; break;
} }
Game.AddChatLine(Color.White, "Server", "The game has started."); Game.AddChatLine(Color.White, ServerChatName, "The game has started.");
Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, WorldType.Regular); Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, WorldType.Regular);
break; break;
} }
@@ -119,7 +121,7 @@ namespace OpenRA.Network
if (orderManager.World.Paused != pause && world != null && !world.LobbyInfo.IsSinglePlayer) if (orderManager.World.Paused != pause && world != null && !world.LobbyInfo.IsSinglePlayer)
{ {
var pausetext = "The game is {0} by {1}".F(pause ? "paused" : "un-paused", client.Name); var pausetext = "The game is {0} by {1}".F(pause ? "paused" : "un-paused", client.Name);
Game.AddChatLine(Color.White, "", pausetext); Game.AddChatLine(Color.White, ServerChatName, pausetext);
} }
orderManager.World.Paused = pause; orderManager.World.Paused = pause;