epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved call to FindMaps into ChangeMods

Browse Source
This commit is contained in:
Bob
2010-08-21 19:20:06 +12:00
parent 1a4e3053ce
commit aeb9f4e441
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Game.cs
View File

@@ -65,12 +65,11 @@ namespace OpenRA
static void ChangeMods() static void ChangeMods()
{ {
Timer.Time( "----ChangeMods" ); AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
modData = new ModData( LobbyInfo.GlobalSettings.Mods ); modData = new ModData( LobbyInfo.GlobalSettings.Mods );
ChromeProvider.Initialize( modData.Manifest.Chrome ); ChromeProvider.Initialize( modData.Manifest.Chrome );
packageChangePending = false;
Timer.Time( "load assemblies, packages: {0}" );
} }
static void LoadMap(string mapName) static void LoadMap(string mapName)
@@ -157,10 +156,8 @@ namespace OpenRA
if (packageChangePending) if (packageChangePending)
{ {
// TODO: Only do this on mod change // TODO: Only do this on mod change
Timer.Time("----begin maplist");
AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
Timer.Time("maplist: {0}");
ChangeMods(); ChangeMods();
packageChangePending = false;
return; return;
} }
@@ -388,7 +385,6 @@ namespace OpenRA
PerfHistory.items["batches"].hasNormalTick = false; PerfHistory.items["batches"].hasNormalTick = false;
PerfHistory.items["text"].hasNormalTick = false; PerfHistory.items["text"].hasNormalTick = false;
PerfHistory.items["cursor"].hasNormalTick = false; PerfHistory.items["cursor"].hasNormalTick = false;
AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
ChangeMods(); ChangeMods();