Merge pull request #10786 from pchote/mappreview-packages

Remove internal use of map paths.
This commit is contained in:
Oliver Brakmann
2016-02-23 22:52:54 +01:00
21 changed files with 172 additions and 174 deletions

View File

@@ -12,6 +12,7 @@
using System;
using System.IO;
using System.Linq;
using OpenRA.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands
{
@@ -100,21 +101,21 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
Console.WriteLine("Processing Maps:");
var mapPaths = modData.MapCache
.Where(m => m.Status == MapStatus.Available)
.Select(m => m.Path);
var mapPreviews = modData.MapCache
.Where(m => m.Status == MapStatus.Available);
foreach (var path in mapPaths)
foreach (var p in mapPreviews)
{
Console.WriteLine("\t" + path);
UpgradeRules.UpgradeMapFormat(modData, path);
var package = (IReadWritePackage)p.Package;
Console.WriteLine("\t" + package.Name);
UpgradeRules.UpgradeMapFormat(modData, package);
var map = new Map(path);
var map = new Map(modData, package);
UpgradeRules.UpgradeActorRules(engineDate, ref map.RuleDefinitions, null, 0);
UpgradeRules.UpgradeWeaponRules(engineDate, ref map.WeaponDefinitions, null, 0);
UpgradeRules.UpgradePlayers(engineDate, ref map.PlayerDefinitions, null, 0);
UpgradeRules.UpgradeActors(engineDate, ref map.ActorDefinitions, null, 0);
map.Save(map.Path);
map.Save(package);
}
}
}