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

Improve logging on sequence error.

Browse Source
This commit is contained in:
Paul Chote
2016-07-03 12:13:26 +01:00
parent 77e00e4587
commit 5fbe747de2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -34,15 +34,22 @@ namespace OpenRA.Mods.Common.Graphics
var nodes = node.Value.ToDictionary(); var nodes = node.Value.ToDictionary();
MiniYaml defaults; MiniYaml defaults;
if (nodes.TryGetValue("Defaults", out defaults)) try
{ {
nodes.Remove("Defaults"); if (nodes.TryGetValue("Defaults", out defaults))
foreach (var n in nodes)
{ {
n.Value.Nodes = MiniYaml.Merge(new[] { defaults.Nodes, n.Value.Nodes }); nodes.Remove("Defaults");
n.Value.Value = n.Value.Value ?? defaults.Value; foreach (var n in nodes)
{
n.Value.Nodes = MiniYaml.Merge(new[] { defaults.Nodes, n.Value.Nodes });
n.Value.Value = n.Value.Value ?? defaults.Value;
}
} }
} }
catch (Exception e)
{
throw new Exception("Error occurred while parsing {0}".F(node.Key), e);
}
foreach (var kvp in nodes) foreach (var kvp in nodes)
{ {