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

merge call of FileSystem.LoadFromManifest into modData ctor

Browse Source
This commit is contained in:
Bob
2010-08-21 17:28:51 +12:00
parent 38ffd30b28
commit bcc3cd32ae
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Editor/Form1.cs
View File

@@ -34,7 +34,6 @@ namespace OpenRA.Editor
var manifest = new Manifest(new[] { currentMod }); var manifest = new Manifest(new[] { currentMod });
Game.modData = new ModData( manifest ); Game.modData = new ModData( manifest );
FileSystem.LoadFromManifest( manifest );
Rules.LoadRules(manifest, new Map()); Rules.LoadRules(manifest, new Map());
@@ -61,7 +60,6 @@ namespace OpenRA.Editor
var manifest = new Manifest(new[] { currentMod }); var manifest = new Manifest(new[] { currentMod });
Game.modData = new ModData( manifest ); Game.modData = new ModData( manifest );
FileSystem.LoadFromManifest( manifest );
// load the map // load the map
var map = new Map(new Folder(mapname)); var map = new Map(new Folder(mapname));
@@ -87,7 +85,6 @@ namespace OpenRA.Editor
var manifest = new Manifest(new[] { currentMod }); var manifest = new Manifest(new[] { currentMod });
Game.modData = new ModData( manifest ); Game.modData = new ModData( manifest );
FileSystem.LoadFromManifest( manifest );
PrepareMapResources(manifest, map); PrepareMapResources(manifest, map);

5
OpenRA.Game/Game.cs
View File

@@ -70,7 +70,6 @@ namespace OpenRA
Timer.Time("manifest: {0}"); Timer.Time("manifest: {0}");
modData = new ModData( manifest ); modData = new ModData( manifest );
SheetBuilder.Initialize(); SheetBuilder.Initialize();
FileSystem.LoadFromManifest( manifest );
Timer.Time("load assemblies, packages: {0}"); Timer.Time("load assemblies, packages: {0}");
ChromeProvider.Initialize(manifest.Chrome); ChromeProvider.Initialize(manifest.Chrome);
packageChangePending = false; packageChangePending = false;
@@ -451,9 +450,6 @@ namespace OpenRA
LobbyInfo.GlobalSettings.Mods = Settings.InitialMods; LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;
var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods); var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
modData = new ModData( manifest ); modData = new ModData( manifest );
// Load the default mod to access required files
FileSystem.LoadFromManifest( manifest );
Renderer.SheetSize = Settings.SheetSize; Renderer.SheetSize = Settings.SheetSize;
@@ -537,7 +533,6 @@ namespace OpenRA
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly; AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
var manifest = new Manifest(mods); var manifest = new Manifest(mods);
modData = new ModData( manifest ); modData = new ModData( manifest );
FileSystem.LoadFromManifest( manifest );
Rules.LoadRules(manifest, new Map()); Rules.LoadRules(manifest, new Map());
} }

1
OpenRA.Game/ModData.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA
{ {
Manifest = manifest; Manifest = manifest;
ObjectCreator = new ObjectCreator( manifest ); ObjectCreator = new ObjectCreator( manifest );
FileSystem.LoadFromManifest( manifest );
} }
} }
} }