From 77e00e4587e43054a6878f8d0dccaaf231a46bda Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 3 Jul 2016 11:47:16 +0100 Subject: [PATCH] Allow sequence blocks to remove inherited node Defaults. --- OpenRA.Game/MiniYaml.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/MiniYaml.cs b/OpenRA.Game/MiniYaml.cs index 80b663edba..03ae4c6ecd 100644 --- a/OpenRA.Game/MiniYaml.cs +++ b/OpenRA.Game/MiniYaml.cs @@ -275,7 +275,9 @@ namespace OpenRA 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()); } static void MergeIntoResolved(MiniYamlNode overrideNode, List existingNodes,