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

Allow sequence blocks to remove inherited node Defaults.

Browse Source
This commit is contained in:
Paul Chote
2016-07-03 11:47:16 +01:00
parent ac6b2a8f62
commit 77e00e4587
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/MiniYaml.cs
View File

@@ -275,7 +275,9 @@ namespace OpenRA
resolved.Add(kv.Key, new MiniYaml(kv.Value.Value, children)); resolved.Add(kv.Key, new MiniYaml(kv.Value.Value, children));
} }
return resolved.Select(kv => new MiniYamlNode(kv.Key, kv.Value)).ToList(); // Resolve any top-level removals (e.g. removing whole actor blocks)
var nodes = new MiniYaml("", resolved.Select(kv => new MiniYamlNode(kv.Key, kv.Value)).ToList());
return ResolveInherits("", nodes, tree, new Dictionary<string, MiniYamlNode.SourceLocation>());
} }
static void MergeIntoResolved(MiniYamlNode overrideNode, List<MiniYamlNode> existingNodes, static void MergeIntoResolved(MiniYamlNode overrideNode, List<MiniYamlNode> existingNodes,