inlined ChangeMap, since that wasnt really what it did

This commit is contained in:
Chris Forbes
2010-05-05 18:10:01 +12:00
parent fcdc3c2bf0
commit d2009e9e7d

View File

@@ -131,12 +131,6 @@ namespace OpenRA
packageChangePending = false; packageChangePending = false;
} }
static void ChangeMap(string newMapName)
{
mapName = newMapName;
mapChangePending = false;
}
static void LoadMap(string mapName) static void LoadMap(string mapName)
{ {
Timer.Time( "----LoadMap" ); Timer.Time( "----LoadMap" );
@@ -271,7 +265,8 @@ namespace OpenRA
if (mapChangePending) if (mapChangePending)
{ {
ChangeMap(LobbyInfo.GlobalSettings.Map); mapName = LobbyInfo.GlobalSettings.Map;
mapChangePending = false;
return; return;
} }