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

Fix utility commands being unable to open oramaps.

Browse Source
This commit is contained in:
Paul Chote
2016-07-09 00:30:04 +01:00
parent 196dd04b5d
commit 4e32610056
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
Game.ModData = modData; Game.ModData = modData;
var map = new Map(modData, modData.ModFiles.OpenPackage(args[1])); var map = new Map(modData, modData.ModFiles.OpenPackage(args[1], new Folder(".")));
MergeAndPrint(map, "Rules", map.RuleDefinitions); MergeAndPrint(map, "Rules", map.RuleDefinitions);
MergeAndPrint(map, "Sequences", map.SequenceDefinitions); MergeAndPrint(map, "Sequences", map.SequenceDefinitions);
MergeAndPrint(map, "VoxelSequences", map.VoxelSequenceDefinitions); MergeAndPrint(map, "VoxelSequences", map.VoxelSequenceDefinitions);

3
OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System; using System;
using OpenRA.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands
{ {
@@ -25,7 +26,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
[Desc("MAPFILE", "Generate hash of specified oramap file.")] [Desc("MAPFILE", "Generate hash of specified oramap file.")]
public void Run(ModData modData, string[] args) public void Run(ModData modData, string[] args)
{ {
using (var package = modData.ModFiles.OpenPackage(args[1])) using (var package = modData.ModFiles.OpenPackage(args[1], new Folder(".")))
Console.WriteLine(Map.ComputeUID(package)); Console.WriteLine(Map.ComputeUID(package));
} }
} }

3
OpenRA.Mods.Common/UtilityCommands/OutputActorMiniYamlCommand.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands
{ {
@@ -27,7 +28,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
try try
{ {
mapPath = args[2]; mapPath = args[2];
map = new Map(modData, modData.ModFiles.OpenPackage(mapPath)); map = new Map(modData, modData.ModFiles.OpenPackage(mapPath, new Folder(".")));
} }
catch (InvalidDataException) catch (InvalidDataException)
{ {

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

@@ -49,7 +49,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(modData, modData.ModFiles.OpenPackage(args[1])); map = new Map(modData, modData.ModFiles.OpenPackage(args[1], new Folder(".")));
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);