From d2009e9e7d4bf7078f91c5bd8760f0b4bf5f3a21 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 5 May 2010 18:10:01 +1200
Subject: [PATCH] inlined ChangeMap, since that wasnt really what it did

---
 OpenRA.Game/Game.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 3daccf7491..ab2eb3c567 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -131,12 +131,6 @@ namespace OpenRA
 			packageChangePending = false;
 		}
 		
-		static void ChangeMap(string newMapName)
-		{
-			mapName = newMapName;
-			mapChangePending = false;
-		}
-		
 		static void LoadMap(string mapName)
 		{
 			Timer.Time( "----LoadMap" );
@@ -271,7 +265,8 @@ namespace OpenRA
 			
 			if (mapChangePending)
 			{
-				ChangeMap(LobbyInfo.GlobalSettings.Map);
+				mapName = LobbyInfo.GlobalSettings.Map;
+				mapChangePending = false;
 				return;
 			}