This commit is contained in:
Chris Forbes
2010-01-14 21:05:25 +13:00
parent 9b90ac1f3f
commit 370b7ff1aa
2 changed files with 3 additions and 7 deletions

View File

@@ -69,11 +69,7 @@ namespace OpenRa.Game
{
var race = players.ContainsKey(i) ? players[i].Race : Race.Allies;
var name = players.ContainsKey(i) ? players[i].PlayerName : "Player {0}".F(i+1);
var a = new Actor("Player", new int2(int.MaxValue, int.MaxValue), null);
players[i] = new Player(a, i, (PaletteType) i, name, race, "Multi{0}".F(i));
a.Owner = players[i];
Game.world.Add(a);
players[i] = new Player(i, (PaletteType) i, name, race, "Multi{0}".F(i));
}
var worldActor = new Actor("World", new int2(int.MaxValue, int.MaxValue), null);

View File

@@ -30,9 +30,9 @@ namespace OpenRa.Game
public Shroud Shroud = new Shroud();
public Dictionary<string, SupportPower> SupportPowers;
public Player( Actor playerActor, int index, PaletteType palette, string playerName, Race race, string internalName )
public Player( int index, PaletteType palette, string playerName, Race race, string internalName )
{
this.PlayerActor = playerActor;
Game.world.Add(this.PlayerActor = new Actor("Player", new int2(int.MaxValue, int.MaxValue), this));
this.Index = index;
this.Palette = palette;
this.InternalName = internalName;