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

fix dumb bugs, remove remaining 'allies' reference in server

Browse Source
This commit is contained in:
Chris Forbes
2010-02-10 17:28:03 +13:00
parent ea3b674d9a
commit 599537b575
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Server/Server.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Server
Index = newConn.PlayerIndex, Index = newConn.PlayerIndex,
PaletteIndex = ChooseFreePalette(), PaletteIndex = ChooseFreePalette(),
Name = "Player {0}".F(1 + newConn.PlayerIndex), Name = "Player {0}".F(1 + newConn.PlayerIndex),
Country = "allies", /* hack */ Country = "", /* hack */
State = Session.ClientState.NotReady State = Session.ClientState.NotReady
}); });

2
OpenRa.Game/Chrome.cs
View File

@@ -368,7 +368,7 @@ namespace OpenRa
.Skip(1) .Skip(1)
.First(); .First();
Game.IssueOrder(Order.Chat("/race " + nextCountry)); Game.IssueOrder(Order.Chat("/race " + nextCountry.Name));
} }
void CycleReady(bool left) void CycleReady(bool left)

3
OpenRa.Game/Player.cs
View File

@@ -178,6 +178,9 @@ namespace OpenRa
PlayerName = client.Name; PlayerName = client.Name;
} }
if (string.IsNullOrEmpty(client.Country))
client.Country = PlayerActor.World.GetCountries().First().Name;
if (Country.Name != client.Country) if (Country.Name != client.Country)
{ {
Game.chat.AddLine(this, "is now playing {0}".F(client.Country)); Game.chat.AddLine(this, "is now playing {0}".F(client.Country));