Merge pull request #9710 from obrakmann/yaml-removals

Fix yaml removals
This commit is contained in:
Matthias Mailänder
2015-12-06 17:04:47 +01:00
16 changed files with 170 additions and 104 deletions

View File

@@ -97,8 +97,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Add a group for each campaign
if (Game.ModData.Manifest.Missions.Any())
{
var yaml = Game.ModData.Manifest.Missions.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergeLiberal);
var partial = Game.ModData.Manifest.Missions
.Select(MiniYaml.FromFile)
.Aggregate(MiniYaml.MergePartial);
var yaml = MiniYaml.ApplyRemovals(partial);
foreach (var kv in yaml)
{
var missionMapPaths = kv.Value.Nodes.Select(n => Path.GetFullPath(n.Key));