fix dumb bugs, remove remaining 'allies' reference in server
This commit is contained in:
@@ -108,7 +108,7 @@ namespace OpenRA.Server
|
||||
Index = newConn.PlayerIndex,
|
||||
PaletteIndex = ChooseFreePalette(),
|
||||
Name = "Player {0}".F(1 + newConn.PlayerIndex),
|
||||
Country = "allies", /* hack */
|
||||
Country = "", /* hack */
|
||||
State = Session.ClientState.NotReady
|
||||
});
|
||||
|
||||
|
||||
@@ -368,7 +368,7 @@ namespace OpenRa
|
||||
.Skip(1)
|
||||
.First();
|
||||
|
||||
Game.IssueOrder(Order.Chat("/race " + nextCountry));
|
||||
Game.IssueOrder(Order.Chat("/race " + nextCountry.Name));
|
||||
}
|
||||
|
||||
void CycleReady(bool left)
|
||||
|
||||
@@ -178,6 +178,9 @@ namespace OpenRa
|
||||
PlayerName = client.Name;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(client.Country))
|
||||
client.Country = PlayerActor.World.GetCountries().First().Name;
|
||||
|
||||
if (Country.Name != client.Country)
|
||||
{
|
||||
Game.chat.AddLine(this, "is now playing {0}".F(client.Country));
|
||||
|
||||
Reference in New Issue
Block a user