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/VoxelProvider.cs
+++ b/OpenRA.Game/Graphics/VoxelProvider.cs
@@ -23,11 +23,7 @@ namespace OpenRA.Graphics
 		{
 			units = new Dictionary<string, Dictionary<string, Voxel>>();

-			var partial = voxelFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(voxelNodes, MiniYaml.MergePartial);
-
-			var sequences = MiniYaml.ApplyRemovals(partial);
+			var sequences = MiniYaml.Merge(voxelFiles.Select(MiniYaml.FromFile));
 			foreach (var s in sequences)
 				LoadVoxelsForUnit(s.Key, s.Value);