Fixed recalling sometimes invalidating undo

wesnoth · May 6, 2014 · f5355c3 · f5355c3
1 parent 9ade865
commit f5355c3
Showing 1 changed file with 39 additions and 31 deletions.
diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
@@ -120,39 +120,47 @@
     [/event]
 
     [event]
-        name=prerecall
-        first_time_only=no
-
-        [filter]
-            side={SIDES}
+        name=start
 
-            [not]
-                [filter_wml]
-                    [modifications]
-                        [trait]
-                            id=loyal
-                        [/trait]
-                    [/modifications]
-                [/filter_wml]
-            [/not]
-
-            [not]
-                [filter_wml]
-                    [variables]
-                        great_horde_upkeep_mod_applied=yes
-                    [/variables]
-                [/filter_wml]
-            [/not]
-        [/filter]
-
-        {VARIABLE unit.upkeep $unit.level}
-        {VARIABLE_OP unit.upkeep sub 1}
-        {VARIABLE unit.variables.great_horde_upkeep_mod_applied yes}
+        [store_unit]
+            [filter]
+                side={SIDES}
+
+                [not]
+                    [filter_wml]
+                        [modifications]
+                            [trait]
+                                id=loyal
+                            [/trait]
+                        [/modifications]
+                    [/filter_wml]
+                [/not]
+
+                [not]
+                    [filter_wml]
+                        [variables]
+                            great_horde_upkeep_mod_applied=yes
+                        [/variables]
+                    [/filter_wml]
+                [/not]
+            [/filter]
 
-        [unstore_unit]
-            variable=unit
-            find_vacant=no
-        [/unstore_unit]
+            kill=yes
+            variable=horde_units
+        [/store_unit]
+
+        {FOREACH horde_units i}
+            {VARIABLE horde_units[$i].upkeep $horde_units[$i].level}
+            {VARIABLE_OP horde_units[$i].upkeep sub 1}
+            {VARIABLE horde_units[$i].variables.great_horde_upkeep_mod_applied yes}
+
+            [unstore_unit]
+                variable=horde_units[$i]
+                find_vacant=no
+            [/unstore_unit]
+        {NEXT i}
+
+        {CLEAR_VARIABLE horde_units}
     [/event]
 
     [event]