Disable wesnoth/wesnoth#4419 workaround on 1.15.4 and later

project-ethea · Aug 22, 2020 · 0f110bc · 0f110bc
1 parent add9e8c
commit 0f110bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,8 @@ Version 20200816+dev:
   * Add `VARIABLE_COPY` and `VARIABLE_ARRAY_COPY` macros.
   * Fix issues with `[harm_multiple_units]` crashing when there isn't a valid
     attack source.
+  * Made `AMLA_BUG_4419_WORKAROUND` a no-op on 1.15.4 and later since mainline
+    #4419 is solved there.
 
 
 Version 20200816:

diff --git a/macros/amla.cfg b/macros/amla.cfg
@@ -89,6 +89,7 @@
     [/advancement]
 #enddef
 
+#ifver WESNOTH_VERSION <= 1.15.3
 #
 # Works around a nasty bug with the modifications system in Wesnoth 1.14 (and
 # possibly others). This is needed for any AMLAs that change unit stats in a
@@ -100,9 +101,17 @@
 # base variation during gameplay. If the current variation is supposed to be
 # something dynamic then you're on your own. Godspeed.
 #
+
 #define AMLA_BUG_4419_WORKAROUND
     [effect]
         apply_to=variation
         name=""
     [/effect]
 #enddef
+
+#else
+
+#define AMLA_BUG_4419_WORKAROUND
+#enddef
+
+#endif