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

Unknown race -> Random; make it actually work, too.

Browse Source
This commit is contained in:
Chris Forbes
2010-03-18 13:18:41 +13:00
parent c17459310a
commit 8a05af72b3
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Chrome.cs
View File

@@ -397,16 +397,16 @@ namespace OpenRA
void CycleRace(bool left) void CycleRace(bool left)
{ {
var countries = Game.world.GetCountries(); var countries = new[] { "Random" }.Concat(Game.world.GetCountries().Select(c => c.Name));
var nextCountry = countries var nextCountry = countries
.SkipWhile(c => c.Name != Game.LocalClient.Country) .SkipWhile(c => c != Game.LocalClient.Country)
.Skip(1) .Skip(1)
.FirstOrDefault(); .FirstOrDefault();
if (nextCountry == null) if (nextCountry == null)
nextCountry = countries.First(); nextCountry = countries.First();
Game.IssueOrder(Order.Chat("/race " + nextCountry.Name)); Game.IssueOrder(Order.Chat("/race " + nextCountry));
} }
void CycleReady(bool left) void CycleReady(bool left)
@@ -511,7 +511,7 @@ namespace OpenRA
paletteRect.Bottom+Game.viewport.Location.Y - 5), paletteRect.Bottom+Game.viewport.Location.Y - 5),
Player.PlayerColors[client.PaletteIndex].c); Player.PlayerColors[client.PaletteIndex].c);
lineRenderer.Flush(); lineRenderer.Flush();
f.DrawText(rgbaRenderer, client.Country ?? "Unknown", new int2(r.Left + 220, y), Color.White); f.DrawText(rgbaRenderer, client.Country, new int2(r.Left + 220, y), Color.White);
f.DrawText(rgbaRenderer, client.State.ToString(), new int2(r.Left + 290, y), Color.White); f.DrawText(rgbaRenderer, client.State.ToString(), new int2(r.Left + 290, y), Color.White);
f.DrawText(rgbaRenderer, (client.SpawnPoint == 0) ? "-" : client.SpawnPoint.ToString(), new int2(r.Left + 410, y), Color.White); f.DrawText(rgbaRenderer, (client.SpawnPoint == 0) ? "-" : client.SpawnPoint.ToString(), new int2(r.Left + 410, y), Color.White);
y += 30; y += 30;

6
OpenRA.Game/Exts.cs
View File

@@ -86,5 +86,11 @@ namespace OpenRA
d.Add( k, ret = createFn( k ) ); d.Add( k, ret = createFn( k ) );
return ret; return ret;
} }
public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
{
var xs = ts.ToArray();
return xs[r.Next(xs.Length)];
}
} }
} }

6
OpenRA.Game/Player.cs
View File

@@ -87,10 +87,10 @@ namespace OpenRA
Palette = "neutral"; Palette = "neutral";
Color = Color.Gray; // HACK HACK Color = Color.Gray; // HACK HACK
} }
Country = world.GetCountries() Country = world.GetCountries()
.FirstOrDefault( c => client != null && client.Country == c.Name ) .FirstOrDefault(c => client != null && client.Country == c.Name)
?? world.GetCountries().First(); ?? world.GetCountries().Random(world.SharedRandom);
} }
void UpdatePower() void UpdatePower()

2
OpenRA.Game/Server/Server.cs
View File

@@ -147,7 +147,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 = "", /* hack */ Country = "Random",
State = Session.ClientState.NotReady State = Session.ClientState.NotReady
}); });