inlined ChangeMap, since that wasnt really what it did
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user