SoF: fix miner standing animation

wesnoth · Mar 16, 2019 · 6265b63 · 6265b63
1 parent 073081e
commit 6265b63
Showing 1 changed file with 14 additions and 26 deletions.
diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg
@@ -27,39 +27,27 @@
         icon=attacks/pick-axe.png
     [/attack]
     [standing_anim]
-        [filter]
-            role=loaded
-            [or]
-                role=has_coal
-            [/or]
-            [or]
-                role=has_gold
-            [/or]
-        [/filter]
-        start_time=0
-        [frame]
-            image=units/dwarves/miner-laden.png:1000
-        [/frame]
-    [/standing_anim]
-
-    # FIXME: this animation is defined to work around a crash due to no valid
-    # standing animation being available to an unloaded miner otherwise
-    [standing_anim]
-        [filter]
-            [not]
+        [if]
+            [filter]
                 role=loaded
                 [or]
                     role=has_coal
                 [/or]
                 [or]
                     role=has_gold
                 [/or]
-            [/not]
-        [/filter]
-        start_time=0
-        [frame]
-            image=units/dwarves/miner.png:1000
-        [/frame]
+            [/filter]
+            start_time=0
+            [frame]
+                image=units/dwarves/miner-laden.png:1000
+            [/frame]
+        [/if]
+        [else]
+            start_time=0
+            [frame]
+                image=units/dwarves/miner.png:1000
+            [/frame]
+        [/else]
     [/standing_anim]
     [attack_anim]
         [filter_attack]