From f01990cae1158febe3d2cde3303947cd712de76e Mon Sep 17 00:00:00 2001
From: Bob <Bob@nameless.(none)>
Date: Thu, 21 Jan 2010 13:44:02 +1300
Subject: [PATCH] some refs to "Game.world" i missed a while ago.

---
 OpenRa.Game/Game.cs               | 2 +-
 OpenRa.Game/GameRules/TechTree.cs | 2 +-
 OpenRa.Game/Graphics/Minimap.cs   | 4 ++--
 OpenRa.Game/Graphics/Viewport.cs  | 8 ++++----
 OpenRa.Game/World.cs              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 464bb457c1..acc01f93b2 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -210,7 +210,7 @@ namespace OpenRa
 				world.CreateActor("mcv", sp, world.players[client.Index]);
 			}
 
-			Game.viewport.GoToStartLocation();
+			Game.viewport.GoToStartLocation( Game.world.LocalPlayer );
 			orderManager.StartGame();
 		}
 
diff --git a/OpenRa.Game/GameRules/TechTree.cs b/OpenRa.Game/GameRules/TechTree.cs
index 7abac04ac7..14899a7154 100755
--- a/OpenRa.Game/GameRules/TechTree.cs
+++ b/OpenRa.Game/GameRules/TechTree.cs
@@ -23,7 +23,7 @@ namespace OpenRa.GameRules
 		public Cache<string, List<Actor>> GatherBuildings( Player player )
 		{
 			var ret = new Cache<string, List<Actor>>( x => new List<Actor>() );
-			foreach( var b in Game.world.Actors.Where( x => x.Owner == player && x.Info.Traits.Contains<BuildingInfo>() ) )
+			foreach( var b in player.World.Actors.Where( x => x.Owner == player && x.Info.Traits.Contains<BuildingInfo>() ) )
 			{
 				ret[ b.Info.Name ].Add( b );
 				var buildable = b.Info.Traits.GetOrDefault<BuildableInfo>();
diff --git a/OpenRa.Game/Graphics/Minimap.cs b/OpenRa.Game/Graphics/Minimap.cs
index 254a6f9fec..588bf2b371 100644
--- a/OpenRa.Game/Graphics/Minimap.cs
+++ b/OpenRa.Game/Graphics/Minimap.cs
@@ -81,7 +81,7 @@ namespace OpenRa.Graphics
 
 			mapOnlySheet.Texture.SetData(oreLayer);
 
-			if (!world.Actors.Any(a => a.Owner == Game.world.LocalPlayer && a.traits.Contains<ProvidesRadar>()))
+			if (!world.Actors.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<ProvidesRadar>()))
 				return;
 
 			var bitmap = new Bitmap(oreLayer);
@@ -109,7 +109,7 @@ namespace OpenRa.Graphics
 				{
 					for (var y = 0; y < 128; y++)
 						for (var x = 0; x < 128; x++)
-							if (!Game.world.LocalPlayer.Shroud.DisplayOnRadar(x, y))
+							if (!world.LocalPlayer.Shroud.DisplayOnRadar(x, y))
 								*(c + (y * bitmapData.Stride >> 2) + x) = shroudColor.ToArgb();
 				}
 			}
diff --git a/OpenRa.Game/Graphics/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs
index 18fe71cb75..1e198ad97e 100644
--- a/OpenRa.Game/Graphics/Viewport.cs
+++ b/OpenRa.Game/Graphics/Viewport.cs
@@ -44,7 +44,7 @@ namespace OpenRa.Graphics
 
 		public void DrawRegions( World world )
 		{
-			Game.world.WorldRenderer.palette.Update(Game.world.Actors.SelectMany(
+			world.WorldRenderer.palette.Update(world.Actors.SelectMany(
 				a => a.traits.WithInterface<IPaletteModifier>()));
 
 			float2 r1 = new float2(2, -2) / screenSize;
@@ -54,7 +54,7 @@ namespace OpenRa.Graphics
 
 			if( Game.orderManager.GameStarted )
 			{
-				Game.world.WorldRenderer.Draw();
+				world.WorldRenderer.Draw();
 				Game.chrome.Draw( world );
 
 				if (Game.orderManager.IsNetplay && 
@@ -130,9 +130,9 @@ namespace OpenRa.Graphics
 			scrollPosition = (avgPos - .5f * new float2(Width, Height)).ToInt2();
 		}
 
-		public void GoToStartLocation()
+		public void GoToStartLocation( Player player )
 		{
-			Center(Game.world.Actors.Where(a => a.Owner == Game.world.LocalPlayer && a.traits.Contains<Selectable>()));
+			Center(player.World.Actors.Where(a => a.Owner == player && a.traits.Contains<Selectable>()));
 		}
 	}
 }
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index cd3793f964..b9e2cf4dae 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -24,7 +24,7 @@ namespace OpenRa
 			set
 			{
 				localPlayerIndex = value.Index;
-				Game.viewport.GoToStartLocation();
+				Game.viewport.GoToStartLocation( value );
 			}
 		}