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

Tidy ModData/ModFiles usage in utility commands.

Browse Source
This commit is contained in:
Paul Chote
2016-02-15 03:21:16 +00:00
parent edf59b159f
commit 24e9294741
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
// HACK: The engine code assumes that Game.modData is set. // HACK: The engine code assumes that Game.modData is set.
Game.ModData = modData; Game.ModData = modData;
modData.ModFiles.LoadFromManifest(modData.Manifest);
modData.SpriteSequenceLoader.OnMissingSpriteError = s => Console.WriteLine("\t" + s); modData.SpriteSequenceLoader.OnMissingSpriteError = s => Console.WriteLine("\t" + s);
foreach (var t in modData.Manifest.TileSets) foreach (var t in modData.Manifest.TileSets)

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

@@ -27,11 +27,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
public void Run(ModData modData, string[] args) public void Run(ModData modData, string[] args)
{ {
var files = args.Skip(1); var files = args.Skip(1);
modData.ModFiles.LoadFromManifest(modData.Manifest);
foreach (var f in files) foreach (var f in files)
{ {
var src = modData.ModFiles.Open(f); var src = modData.DefaultFileSystem.Open(f);
if (src == null) if (src == null)
throw new InvalidOperationException("File not found: {0}".F(f)); throw new InvalidOperationException("File not found: {0}".F(f));
var data = src.ReadAllBytes(); var data = src.ReadAllBytes();

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

@@ -31,7 +31,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
// HACK: The engine code assumes that Game.modData is set. // HACK: The engine code assumes that Game.modData is set.
Game.ModData = modData; Game.ModData = modData;
modData.ModFiles.LoadFromManifest(modData.Manifest);
var imageField = typeof(TerrainTemplateInfo).GetField("Image"); var imageField = typeof(TerrainTemplateInfo).GetField("Image");
var pickAnyField = typeof(TerrainTemplateInfo).GetField("PickAny"); var pickAnyField = typeof(TerrainTemplateInfo).GetField("PickAny");
@@ -55,7 +54,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var ext in exts) foreach (var ext in exts)
{ {
Stream s; Stream s;
if (modData.ModFiles.TryOpen(template.Images[0] + ext, out s)) if (modData.DefaultFileSystem.TryOpen(template.Images[0] + ext, out s))
s.Dispose(); s.Dispose();
else else
continue; continue;

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

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Rules = modData.RulesetCache.Load(modData.DefaultFileSystem); Rules = modData.RulesetCache.Load(modData.DefaultFileSystem);
var filename = args[1]; var filename = args[1];
using (var stream = modData.ModFiles.Open(filename)) using (var stream = modData.DefaultFileSystem.Open(filename))
{ {
var file = new IniFile(stream); var file = new IniFile(stream);
var basic = file.GetSection("Basic"); var basic = file.GetSection("Basic");

6
OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs
View File

@@ -70,10 +70,10 @@ namespace OpenRA.Mods.TS.UtilityCommands
for (var i = 1; i <= sectionCount; i++, templateIndex++) for (var i = 1; i <= sectionCount; i++, templateIndex++)
{ {
var templateFilename = "{0}{1:D2}.{2}".F(sectionFilename, i, extension); var templateFilename = "{0}{1:D2}.{2}".F(sectionFilename, i, extension);
if (!Game.ModData.ModFiles.Exists(templateFilename)) if (!modData.DefaultFileSystem.Exists(templateFilename))
continue; continue;
using (var s = Game.ModData.ModFiles.Open(templateFilename)) using (var s = modData.DefaultFileSystem.Open(templateFilename))
{ {
Console.WriteLine("\tTemplate@{0}:", templateIndex); Console.WriteLine("\tTemplate@{0}:", templateIndex);
Console.WriteLine("\t\tCategory: {0}", sectionCategory); Console.WriteLine("\t\tCategory: {0}", sectionCategory);
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.TS.UtilityCommands
for (var v = 'a'; v <= 'z'; v++) for (var v = 'a'; v <= 'z'; v++)
{ {
var variant = "{0}{1:D2}{2}.{3}".F(sectionFilename, i, v, extension); var variant = "{0}{1:D2}{2}.{3}".F(sectionFilename, i, v, extension);
if (Game.ModData.ModFiles.Exists(variant)) if (modData.DefaultFileSystem.Exists(variant))
images.Add(variant); images.Add(variant);
} }