mostly sensible init for real players and bots

This commit is contained in:
Chris Forbes
2010-08-25 19:23:25 +12:00
parent cfc937e8eb
commit 0f9221dc5a
6 changed files with 52 additions and 38 deletions

View File

@@ -36,7 +36,8 @@ namespace OpenRA
public readonly CountryInfo Country;
public readonly int Index;
public readonly bool NonCombatant = false;
public readonly int ClientIndex;
public readonly int ClientIndex;
public readonly PlayerReference PlayerRef;
public ShroudRenderer Shroud;
public World World { get; private set; }
@@ -57,29 +58,32 @@ namespace OpenRA
PlayerName = InternalName = pr.Name;
NonCombatant = pr.NonCombatant;
Country = world.GetCountries()
.FirstOrDefault(c => pr.Race == c.Race);
.FirstOrDefault(c => pr.Race == c.Race);
PlayerRef = pr;
RegisterPlayerColor(world, Palette);
}
public Player( World world, Session.Client client )
public Player( World world, Session.Client client, PlayerReference pr, int index )
{
World = world;
Shroud = new ShroudRenderer(this, world.Map);
PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
Index = client.Index;
Palette = "player"+client.Index;
Index = index;
Palette = "player"+index;
Color = client.Color1;
Color2 = client.Color2;
PlayerName = client.Name;
InternalName = "Multi{0}".F(client.Index);
PlayerName = client.Name;
InternalName = pr.Name;
Country = world.GetCountries()
.FirstOrDefault(c => client != null && client.Country == c.Race)
?? world.GetCountries().Random(world.SharedRandom);
ClientIndex = client.Index;
ClientIndex = client.Index;
PlayerRef = pr;
RegisterPlayerColor(world, Palette);
}