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;
}
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)
{
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))
{
mapPackage = modData.ModFiles.OpenPackage(map, kv.Key);
mapPackage = kv.Key.OpenPackage(map, modData.ModFiles);
if (mapPackage == null)
continue;

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

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