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

Remove map loading shim.

Browse Source
This commit is contained in:
Paul Chote
2016-02-20 18:00:07 +00:00
parent d492c23a6d
commit 8a9bce45ec
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Map/Map.cs
View File

@@ -302,10 +302,6 @@ namespace OpenRA
PostInit(); PostInit();
} }
/// <summary>Initializes a map loaded from disk.</summary>
public Map(string path)
: this(Game.ModData, Game.ModData.ModFiles.OpenPackage(path)) { }
public Map(ModData modData, IReadOnlyPackage package) public Map(ModData modData, IReadOnlyPackage package)
{ {
this.modData = modData; this.modData = modData;

2
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
.Select(m => new Map(modData, m.Package))); .Select(m => new Map(modData, m.Package)));
} }
else else
maps.Add(new Map(args[1])); maps.Add(new Map(modData, modData.ModFiles.OpenPackage(args[1])));
foreach (var testMap in maps) foreach (var testMap in maps)
{ {

2
OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
Game.ModData = modData; 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 minimap = Minimap.RenderMapPreview(map.Rules.TileSets[map.Tileset], map, true);
var dest = Path.GetFileNameWithoutExtension(args[1]) + ".png"; var dest = Path.GetFileNameWithoutExtension(args[1]) + ".png";

2
OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
public void Run(ModData modData, string[] args) public void Run(ModData modData, string[] args)
{ {
Game.ModData = modData; 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); Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height);
map.Resize(width, height); map.Resize(width, height);