Fixed the traveler's ring part of bug #22790

2014-10-20 23:14:58 +03:00 · 2014-10-20 23:14:58 +03:00 · b5b97bb574
commit b5b97bb574
parent b3488354cc
1 changed files with 11 additions and 3 deletions
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@ -487,19 +487,25 @@
            image=wesnoth-icon.png
        [/message]

+        [store_locations]
+            x,y=$x1,$y1
+            variable=ring_loc
+        [/store_locations]
+
        [event]
            name=moveto
            id=take_traveler_ring
-            delayed_variable_substitution=no
+            delayed_variable_substitution=yes
            first_time_only=no

            [filter]
-                x=$x1
-                y=$y1
                side=1
                [not]
                    type=Dust Devil
                [/not]
+                [filter_location]
+                    find_in=ring_loc
+                [/filter_location]
            [/filter]

            [message]
@ -541,6 +547,8 @@
                            id=take_traveler_ring
                            remove=true
                        [/event]
+
+                        {CLEAR_VARIABLE ring_loc}
                    [/command]
                [/option]