inlined ChangeMap, since that wasnt really what it did

2010-05-05 18:10:01 +12:00
parent fcdc3c2bf0
commit d2009e9e7d
1 changed files with 2 additions and 7 deletions
--- 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;
 			}