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

Remove obsolete mount hack

Browse Source
This commit is contained in:
reaperrr
2015-09-29 21:09:53 +02:00
parent 17ff3864e8
commit 95709f1157
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Game.cs
View File

@@ -281,6 +281,7 @@ namespace OpenRA
Sound.Initialize(); Sound.Initialize();
ModData = new ModData(mod, !Settings.Server.Dedicated); ModData = new ModData(mod, !Settings.Server.Dedicated);
ModData.MountFiles();
ModData.InitializeLoaders(); ModData.InitializeLoaders();
if (!Settings.Server.Dedicated) if (!Settings.Server.Dedicated)
Renderer.InitializeFonts(ModData.Manifest); Renderer.InitializeFonts(ModData.Manifest);

10
OpenRA.Game/ModData.cs
View File

@@ -74,11 +74,6 @@ namespace OpenRA
SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this }); SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this });
SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s); SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s);
// HACK: Mount only local folders so we have a half-working environment for the asset installer
GlobalFileSystem.UnmountAll();
foreach (var dir in Manifest.Folders)
GlobalFileSystem.Mount(dir);
defaultRules = Exts.Lazy(() => RulesetCache.Load()); defaultRules = Exts.Lazy(() => RulesetCache.Load());
initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId; initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
@@ -92,6 +87,11 @@ namespace OpenRA
LoadScreen.Display(); LoadScreen.Display();
} }
public void MountFiles()
{
GlobalFileSystem.LoadFromManifest(Manifest);
}
public void InitializeLoaders() public void InitializeLoaders()
{ {
// all this manipulation of static crap here is nasty and breaks // all this manipulation of static crap here is nasty and breaks