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

Use MapCache.LoadMapsWithoutCaching in UpgradeModCommand

Browse Source
This commit is contained in:
abcdefg30
2017-10-07 11:32:17 +02:00
committed by Paul Chote
parent 27345c1f6a
commit 98170b0452
1 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,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.
var modData = Game.ModData = utility.ModData; var modData = Game.ModData = utility.ModData;
modData.MapCache.LoadMaps();
var engineDate = Exts.ParseIntegerInvariant(args[1]); var engineDate = Exts.ParseIntegerInvariant(args[1]);
if (engineDate < UpgradeRules.MinimumSupportedVersion) if (engineDate < UpgradeRules.MinimumSupportedVersion)
@@ -77,43 +76,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
// The map cache won't be valid if there was a map format upgrade, so walk the map packages manually // The map cache won't be valid if there was a map format upgrade, so walk the map packages manually
// Only upgrade system maps - user maps must be updated manually using --upgrade-map // Only upgrade system maps - user maps must be updated manually using --upgrade-map
Console.WriteLine("Processing Maps:"); Console.WriteLine("Processing System Maps:");
foreach (var kv in modData.Manifest.MapFolders) foreach (var map in modData.MapCache.EnumerateMapsWithoutCaching())
{ {
var name = kv.Key;
var classification = string.IsNullOrEmpty(kv.Value)
? MapClassification.Unknown : Enum<MapClassification>.Parse(kv.Value);
if (classification != MapClassification.System)
continue;
var optional = name.StartsWith("~");
if (optional)
name = name.Substring(1);
try try
{ {
using (var package = (IReadWritePackage)modData.ModFiles.OpenPackage(name)) UpgradeMapCommand.UpgradeMap(modData, (IReadWritePackage)map.Package, engineDate);
{ }
foreach (var map in package.Contents) catch (Exception e)
{ {
try Console.WriteLine("Failed to upgrade map {0}", map);
{ Console.WriteLine("Error was: {0}", e.ToString());
using (var mapPackage = package.OpenPackage(map, modData.ModFiles))
{
if (mapPackage != null)
UpgradeMapCommand.UpgradeMap(modData, (IReadWritePackage)mapPackage, engineDate);
}
}
catch (Exception e)
{
Console.WriteLine("Failed to upgrade map {0}", map);
Console.WriteLine("Error was: {0}", e.ToString());
}
}
}
} }
catch { }
} }
} }
} }