diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index 76123a6974..b030d11d65 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -302,10 +302,6 @@ namespace OpenRA PostInit(); } - /// Initializes a map loaded from disk. - public Map(string path) - : this(Game.ModData, Game.ModData.ModFiles.OpenPackage(path)) { } - public Map(ModData modData, IReadOnlyPackage package) { this.modData = modData; diff --git a/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs b/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs index 4e8294d945..7cddb8fa48 100644 --- a/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs +++ b/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs @@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.UtilityCommands .Select(m => new Map(modData, m.Package))); } else - maps.Add(new Map(args[1])); + maps.Add(new Map(modData, modData.ModFiles.OpenPackage(args[1]))); foreach (var testMap in maps) { diff --git a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs index 4ffdfd0593..7b849ecd3c 100644 --- a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { Game.ModData = modData; - var map = new Map(args[1]); + var map = new Map(modData, modData.ModFiles.OpenPackage(args[1])); var minimap = Minimap.RenderMapPreview(map.Rules.TileSets[map.Tileset], map, true); var dest = Path.GetFileNameWithoutExtension(args[1]) + ".png"; diff --git a/OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs index d6039796e9..173b29dac3 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands public void Run(ModData modData, string[] args) { Game.ModData = modData; - map = new Map(args[1]); + map = new Map(modData, modData.ModFiles.OpenPackage(args[1])); Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height); map.Resize(width, height);