From 370b7ff1aa70d9e8c8f0470896894a9969e0d34a Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 14 Jan 2010 21:05:25 +1300
Subject: [PATCH] cleaning

---
 OpenRa.Game/Game.cs   | 6 +-----
 OpenRa.Game/Player.cs | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 3e8b5a6f65..c83e86c394 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -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);
diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs
index a7e29cb8c2..e0051e89b1 100644
--- a/OpenRa.Game/Player.cs
+++ b/OpenRa.Game/Player.cs
@@ -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;