update mainline for [cancel_action]

data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg

@@ -348,6 +348,10 @@
     [event]
         name=enter_hex
         first_time_only=yes
+
+        [cancel_action]
+        [/cancel_action]
+
         [filter]
             side=1
             [filter_location]

data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg

@@ -128,6 +128,9 @@
             message= _ "Those stinking trolls ha’ stepped on <i>our</i> land!"
         [/message]
 
+        [cancel_action]
+        [/cancel_action]
+
         [if]
             [variable]
                 name=offended_by_elves
@@ -199,6 +202,9 @@
             message= _ "Fight to subdue, and do not kill unless you must. We have foes enough as it is without making blood enemies of these dwarves."
         [/message]
 
+        [cancel_action]
+        [/cancel_action]
+
         [store_side]
             side=3
             variable=olurf_side

data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg

@@ -255,6 +255,9 @@
             [/filter_location]
         [/filter]
 
+        [cancel_action]
+        [/cancel_action]
+
         [unit]
             side=1
             x,y=19,11

data/core/macros/deprecated-utils.cfg

@@ -377,3 +377,11 @@ _"No gold carried over to the next scenario."#enddef
     # be placed inside an attack animation. Now this sound is played
     # automatically, there is no other use for this macro.
 #enddef
+
+
+#define NO_INTERRUPT_NO_UNDO
+    # This can be used in mid-movement events (enter_hex and exit_hex) to cause
+    # no interruption of movement, yet prevent the move from being undone.
+	{DEPRECATE "NO_INTERRUPT_NO_UNDO" "1.16"}
+#enddef
+

data/core/macros/event-utils.cfg

@@ -38,13 +38,3 @@
         name=param[0]
     [/clear_variable]
 #enddef
-
-#define NO_INTERRUPT_NO_UNDO
-    # This can be used in mid-movement events (enter_hex and exit_hex) to cause
-    # no interruption of movement, yet prevent the move from being undone.
-    [allow_undo]
-    [/allow_undo]
-    [event]
-        name=moveto
-    [/event]
-#enddef