merge call of FileSystem.LoadFromManifest into modData ctor
This commit is contained in:
@@ -34,7 +34,6 @@ namespace OpenRA.Editor
|
||||
|
||||
var manifest = new Manifest(new[] { currentMod });
|
||||
Game.modData = new ModData( manifest );
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
|
||||
Rules.LoadRules(manifest, new Map());
|
||||
|
||||
@@ -61,7 +60,6 @@ namespace OpenRA.Editor
|
||||
|
||||
var manifest = new Manifest(new[] { currentMod });
|
||||
Game.modData = new ModData( manifest );
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
|
||||
// load the map
|
||||
var map = new Map(new Folder(mapname));
|
||||
@@ -87,7 +85,6 @@ namespace OpenRA.Editor
|
||||
|
||||
var manifest = new Manifest(new[] { currentMod });
|
||||
Game.modData = new ModData( manifest );
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
|
||||
PrepareMapResources(manifest, map);
|
||||
|
||||
|
||||
@@ -70,7 +70,6 @@ namespace OpenRA
|
||||
Timer.Time("manifest: {0}");
|
||||
modData = new ModData( manifest );
|
||||
SheetBuilder.Initialize();
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
Timer.Time("load assemblies, packages: {0}");
|
||||
ChromeProvider.Initialize(manifest.Chrome);
|
||||
packageChangePending = false;
|
||||
@@ -452,9 +451,6 @@ namespace OpenRA
|
||||
var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
|
||||
modData = new ModData( manifest );
|
||||
|
||||
// Load the default mod to access required files
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
|
||||
Renderer.SheetSize = Settings.SheetSize;
|
||||
|
||||
var resolution = GetResolution(settings, Game.Settings.WindowMode);
|
||||
@@ -537,7 +533,6 @@ namespace OpenRA
|
||||
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
|
||||
var manifest = new Manifest(mods);
|
||||
modData = new ModData( manifest );
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
|
||||
Rules.LoadRules(manifest, new Map());
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ namespace OpenRA
|
||||
{
|
||||
Manifest = manifest;
|
||||
ObjectCreator = new ObjectCreator( manifest );
|
||||
FileSystem.LoadFromManifest( manifest );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user