Merge pull request #7814 from Phrohdoh/default-image

Image reference in 'Defaults' sequence block.
This commit is contained in:
Matthias Mailänder
2015-04-03 10:36:29 +02:00
2 changed files with 10 additions and 7 deletions

View File

@@ -36,6 +36,9 @@ namespace OpenRA.Mods.Common.Graphics
{
nodes.Remove("Defaults");
nodes = nodes.ToDictionary(kv => kv.Key, kv => MiniYaml.MergeStrict(kv.Value, defaults));
foreach (var n in nodes)
n.Value.Value = n.Value.Value ?? defaults.Value;
}
foreach (var kvp in nodes)

View File

@@ -1,14 +1,14 @@
overlay:
Defaults:
Defaults: place
Offset: 0, -12
build-valid-snow: place
build-valid-temperat: place
build-invalid: place
build-valid-snow:
build-valid-temperat:
build-invalid:
Start: 1
target-select: place
target-select:
poweroff:
offline: poweroff
offline:
Length: *
Tick: 160
@@ -236,7 +236,7 @@ resources:
tib20: tib20
shroud:
shroud: shroud
shroud:
Length: *
fog: fog
Length: *