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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/SequenceProvider.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Graphics
if (sequenceFiles.Length == 0)
return;
var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.Merge);
var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.MergeLiberal);
foreach (var s in sequences)
LoadSequencesForUnit(s.Key, s.Value);