Rewrite yaml merger.

2016-01-30 03:04:34 +00:00
parent 1581ba951f
commit ab921682c4
15 changed files with 253 additions and 305 deletions
--- a/OpenRA.Game/Graphics/ChromeProvider.cs
+++ b/OpenRA.Game/Graphics/ChromeProvider.cs
@@ -33,12 +33,7 @@ namespace OpenRA.Graphics
 			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();

-			var partial = chromeFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(MiniYaml.MergePartial);
-
-			var chrome = MiniYaml.ApplyRemovals(partial);
-
+			var chrome = MiniYaml.Merge(chromeFiles.Select(MiniYaml.FromFile));
 			foreach (var c in chrome)
 				LoadCollection(c.Key, c.Value);
 		}