fix broken merging of yaml overrides in maps; we now have a strict mode and a liberal mode.

This commit is contained in:
Chris Forbes
2011-04-09 10:54:49 +12:00
parent 7cd983a83b
commit ca81871b7b
7 changed files with 35 additions and 12 deletions

View File

@@ -29,7 +29,7 @@ namespace OpenRA.FileFormats
Mods = mods;
var yaml = mods
.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
.Aggregate(MiniYaml.Merge);
.Aggregate(MiniYaml.MergeLiberal);
// Todo: Use fieldloader
Folders = YamlList(yaml, "Folders");