diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 4851c3fd1a..f2bdf80ec7 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -362,7 +362,6 @@ namespace OpenRA return; } - ModData.MountFiles(); ModData.InitializeLoaders(); Renderer.InitializeFonts(ModData.Manifest); diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index 66cb3254fe..8e36fb8717 100644 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -56,6 +56,8 @@ namespace OpenRA LoadScreen.Display(); } + ModFiles.LoadFromManifest(Manifest); + WidgetLoader = new WidgetLoader(this); RulesetCache = new RulesetCache(this); RulesetCache.LoadingProgress += HandleLoadingProgress; @@ -86,11 +88,6 @@ namespace OpenRA LoadScreen.Display(); } - public void MountFiles() - { - ModFiles.LoadFromManifest(Manifest); - } - public void InitializeLoaders() { // all this manipulation of static crap here is nasty and breaks diff --git a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs index 1a52dffc86..04401a8469 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs @@ -33,7 +33,6 @@ namespace OpenRA.Mods.Common.UtilityCommands { // HACK: The engine code assumes that Game.modData is set. Game.ModData = modData; - Game.ModData.MountFiles(); var src = args[1]; var shadowIndex = new int[] { }; diff --git a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs index 3a3286cde2..4ffdfd0593 100644 --- a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs @@ -27,7 +27,6 @@ namespace OpenRA.Mods.Common.UtilityCommands public void Run(ModData modData, string[] args) { Game.ModData = modData; - modData.MountFiles(); var map = new Map(args[1]); var minimap = Minimap.RenderMapPreview(map.Rules.TileSets[map.Tileset], map, true); diff --git a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs index 6d21789266..5f21e83729 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs @@ -44,7 +44,6 @@ namespace OpenRA.Mods.Common.UtilityCommands { // HACK: The engine code assumes that Game.modData is set. Game.ModData = modData; - Game.ModData.MountFiles(); Rules = Game.ModData.RulesetCache.Load(); diff --git a/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs b/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs index 06cff2d28e..ac695d264e 100644 --- a/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs +++ b/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs @@ -154,7 +154,6 @@ namespace OpenRA.Mods.TS.UtilityCommands { // HACK: The engine code assumes that Game.modData is set. Game.ModData = modData; - Game.ModData.MountFiles(); var filename = args[1]; var file = new IniFile(File.Open(args[1], FileMode.Open)); diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs index a0a3aab719..39c4a36c69 100644 --- a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs +++ b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs @@ -29,7 +29,6 @@ namespace OpenRA.Mods.TS.UtilityCommands { // HACK: The engine code assumes that Game.modData is set. Game.ModData = modData; - Game.ModData.MountFiles(); var file = new IniFile(File.Open(args[1], FileMode.Open)); var extension = args[2];