avoid spurious re-indexing of maps just prior to shellmap load

This commit is contained in:
Chris Forbes
2013-04-21 11:38:24 +12:00
parent dc7b2c0f5d
commit 8750f04f4c
2 changed files with 5 additions and 4 deletions

View File

@@ -39,7 +39,7 @@ namespace OpenRA
WidgetLoader = new WidgetLoader( this );
}
public void LoadInitialAssets()
public void LoadInitialAssets(bool enumMaps)
{
// all this manipulation of static crap here is nasty and breaks
// horribly when you use ModData in unexpected ways.
@@ -48,7 +48,8 @@ namespace OpenRA
foreach (var dir in Manifest.Folders)
FileSystem.Mount(dir);
AvailableMaps = FindMaps(Manifest.Mods);
if (enumMaps)
AvailableMaps = FindMaps(Manifest.Mods);
ChromeMetrics.Initialize(Manifest.ChromeMetrics);
ChromeProvider.Initialize(Manifest.Chrome);
@@ -65,7 +66,7 @@ namespace OpenRA
var map = new Map(AvailableMaps[uid].Path);
// Reinit all our assets
LoadInitialAssets();
LoadInitialAssets(false);
foreach (var pkg in Manifest.Packages)
FileSystem.Mount(pkg);