Deprecate ANIMATED_CAMPFIRE and ANIMATED_BRAZIER

Both of these have been replaced with embellishment overlay terrains
wesnoth · Aug 16, 2015 · 0dfe2a2 · 0dfe2a2
1 parent cae0230
commit 0dfe2a2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/data/core/macros/deprecated-utils.cfg b/data/core/macros/deprecated-utils.cfg
@@ -228,3 +228,40 @@ _"No gold carried over to the next scenario."#enddef
         [/clear_variable]
     [/event]
 #enddef
+
+#define ANIMATED_CAMPFIRE X Y
+    # Embed this at scenario toplevel, not within an event.
+    # Note that it will freeze while dialogue popups are onscreen.
+    [terrain_graphics]
+        x={X}
+        y={Y}
+        [tile]
+            x=0
+            y=0
+            [image]
+                layer=0
+                name="misc/fire-A[01~08].png:140"
+            [/image]
+        [/tile]
+    [/terrain_graphics]
+#enddef
+
+#define ANIMATED_BRAZIER X Y
+    # Embed this at scenario toplevel, not within an event.
+    # Note that it will freeze while dialogue popups are onscreen.
+    [terrain_graphics]
+        x={X}
+        y={Y}
+        [tile]
+            x=0
+            y=0
+            [image]
+                layer=0
+                # wmlscope: start ignoring
+                # FIXME: More implicit-path breakage
+                name="../items/brazier-lit[1~8].png:140"
+                # wmlscope: stop ignoring
+            [/image]
+        [/tile]
+    [/terrain_graphics]
+#enddef
diff --git a/data/core/macros/image-utils.cfg b/data/core/macros/image-utils.cfg
@@ -223,43 +223,6 @@
     [/object]
 #enddef
 
-#define ANIMATED_CAMPFIRE X Y
-    # Embed this at scenario toplevel, not within an event.
-    # Note that it will freeze while dialogue popups are onscreen.
-    [terrain_graphics]
-        x={X}
-        y={Y}
-        [tile]
-            x=0
-            y=0
-            [image]
-                layer=0
-                name="misc/fire-A[01~08].png:140"
-            [/image]
-        [/tile]
-    [/terrain_graphics]
-#enddef
-
-#define ANIMATED_BRAZIER X Y
-    # Embed this at scenario toplevel, not within an event.
-    # Note that it will freeze while dialogue popups are onscreen.
-    [terrain_graphics]
-        x={X}
-        y={Y}
-        [tile]
-            x=0
-            y=0
-            [image]
-                layer=0
-                # wmlscope: start ignoring
-                # FIXME: More implicit-path breakage
-                name="../items/brazier-lit[1~8].png:140"
-                # wmlscope: stop ignoring
-            [/image]
-        [/tile]
-    [/terrain_graphics]
-#enddef
-
 #define FLAG_VARIANT NAME
     # Enable the specified flag variant: knalgan, loyalist, ragged,
     # long, undead, or wood-elvish. Use within a [side] block; only