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

Remove legacy FileSystem.OpenPackage(string, IReadOnlyPackage).

Browse Source
This commit is contained in:
Paul Chote
2017-05-24 21:41:13 +01:00
committed by abcdefg30
parent df40d38b91
commit 8321d1f3e3
10 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -81,12 +81,6 @@ namespace OpenRA.FileSystem
return null; return null;
} }
public IReadOnlyPackage OpenPackage(string filename, IReadOnlyPackage parent)
{
// TODO: Make legacy callers access the parent package directly
return parent.OpenPackage(filename, this);
}
public void Mount(string name, string explicitName = null) public void Mount(string name, string explicitName = null)
{ {
var optional = name.StartsWith("~", StringComparison.Ordinal); var optional = name.StartsWith("~", StringComparison.Ordinal);

2
OpenRA.Game/Map/MapCache.cs
View File

@@ -92,7 +92,7 @@ namespace OpenRA
{ {
using (new Support.PerfTimer(map)) using (new Support.PerfTimer(map))
{ {
mapPackage = modData.ModFiles.OpenPackage(map, kv.Key); mapPackage = kv.Key.OpenPackage(map, modData.ModFiles);
if (mapPackage == null) if (mapPackage == null)
continue; continue;

2
OpenRA.Game/Map/MapPreview.cs
View File

@@ -471,7 +471,7 @@ namespace OpenRA
Log.Write("debug", "Downloaded map to '{0}'", mapFilename); Log.Write("debug", "Downloaded map to '{0}'", mapFilename);
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {
var package = modData.ModFiles.OpenPackage(mapFilename, mapInstallPackage); var package = mapInstallPackage.OpenPackage(mapFilename, modData.ModFiles);
if (package == null) if (package == null)
innerData.Status = MapStatus.DownloadError; innerData.Status = MapStatus.DownloadError;
else else

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

@@ -82,7 +82,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(modData, modData.ModFiles.OpenPackage(args[1], new FileSystem.Folder(".")))); maps.Add(new Map(modData, new FileSystem.Folder(".").OpenPackage(args[1], modData.ModFiles)));
foreach (var testMap in maps) foreach (var testMap in maps)
{ {

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

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
var modData = Game.ModData = utility.ModData; var modData = Game.ModData = utility.ModData;
var map = new Map(modData, modData.ModFiles.OpenPackage(args[1], new Folder("."))); var map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles));
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);

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

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
[Desc("MAPFILE", "Generate hash of specified oramap file.")] [Desc("MAPFILE", "Generate hash of specified oramap file.")]
void IUtilityCommand.Run(Utility utility, string[] args) void IUtilityCommand.Run(Utility utility, string[] args)
{ {
using (var package = utility.ModData.ModFiles.OpenPackage(args[1], new Folder("."))) using (var package = new Folder(".").OpenPackage(args[1], utility.ModData.ModFiles))
Console.WriteLine(Map.ComputeUID(package)); Console.WriteLine(Map.ComputeUID(package));
} }
} }

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

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
void IUtilityCommand.Run(Utility utility, string[] args) void IUtilityCommand.Run(Utility utility, string[] args)
{ {
var modData = Game.ModData = utility.ModData; var modData = Game.ModData = utility.ModData;
map = new Map(modData, modData.ModFiles.OpenPackage(args[1], new Folder("."))); map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles));
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);

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

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var modData = Game.ModData = utility.ModData; var modData = Game.ModData = utility.ModData;
// HACK: We know that maps can only be oramap or folders, which are ReadWrite // HACK: We know that maps can only be oramap or folders, which are ReadWrite
var package = modData.ModFiles.OpenPackage(args[1], new Folder(".")) as IReadWritePackage; var package = new Folder(".").OpenPackage(args[1], modData.ModFiles) as IReadWritePackage;
if (package == null) if (package == null)
throw new FileNotFoundException(args[1]); throw new FileNotFoundException(args[1]);

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

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
try try
{ {
using (var mapPackage = modData.ModFiles.OpenPackage(map, package)) using (var mapPackage = package.OpenPackage(map, modData.ModFiles))
{ {
if (mapPackage != null) if (mapPackage != null)
UpgradeMapCommand.UpgradeMap(modData, (IReadWritePackage)mapPackage, engineDate); UpgradeMapCommand.UpgradeMap(modData, (IReadWritePackage)mapPackage, engineDate);

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

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
try try
{ {
map = new Map(modData, modData.ModFiles.OpenPackage(mapPath, new Folder("."))); map = new Map(modData, new Folder(".").OpenPackage(mapPath, modData.ModFiles));
} }
catch (InvalidDataException ex) catch (InvalidDataException ex)
{ {