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

Merge pull request #3134 from chrisforbes/load-time

Browse Source 
avoid spurious re-indexing of maps just prior to shellmap load
This commit is contained in:
Curtis Shmyr
2013-04-20 16:58:48 -07:00
parent d0fe25e022 8750f04f4c
commit f40fbaf35e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -313,7 +313,7 @@ namespace OpenRA
modData = new ModData( mm ); modData = new ModData( mm );
Renderer.InitializeFonts(modData.Manifest); Renderer.InitializeFonts(modData.Manifest);
modData.LoadInitialAssets(); modData.LoadInitialAssets(true);
PerfHistory.items["render"].hasNormalTick = false; PerfHistory.items["render"].hasNormalTick = false;

7
OpenRA.Game/ModData.cs
View File

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