From dc37c53a871da0cb42380539c047398d48addcdb Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 12 Feb 2008 21:48:41 +0000
Subject: [PATCH] Change somme formals.

Also, fix a typo; Jetryl's two macros were defined to
the same name, but one of them needed a _RANGE suffix.
---
 data/core/macros/animation-utils.cfg | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/data/core/macros/animation-utils.cfg b/data/core/macros/animation-utils.cfg
index cc49f927c46..4ab93b8354f 100644
--- a/data/core/macros/animation-utils.cfg
+++ b/data/core/macros/animation-utils.cfg
@@ -3,14 +3,14 @@
 
 # These don't rely on any other macros.   Please don't change this.
 
-#define STANDING_ANIM_DIRECTIONAL BASEFRAME_SE BASEFRAME_NE
+#define STANDING_ANIM_DIRECTIONAL BASE_SE_IMAGE BASE_NE_IMAGE
     [standing_anim]
 		[if]
 			direction=s,se,sw
 	        start_time=0
 			[frame]
 				duration=150
-				image={BASEFRAME_SE}
+				image={BASE_SE_IMAGE}
 			[/frame]
 		[/if]
 		[else]
@@ -18,7 +18,7 @@
 	        start_time=0
 			[frame]
 				duration=150
-				image={BASEFRAME_NE}
+				image={BASE_NE_IMAGE}
 			[/frame]
 		[/else]
     [/standing_anim]
@@ -135,23 +135,23 @@
     [/defend]
 #enddef
 
-#define DEFENSE_ANIM_DIRECTIONAL REACTION_SE BASEFRAME_SE REACTION_NE BASEFRAME_NE HITSOUND
+#define DEFENSE_ANIM_DIRECTIONAL REACTION_SE_IMAGE BASE_SE_IMAGE REACTION_NE_IMAGE BASE_NE_IMAGE HITSOUND
     [defend]
         direction=sw,s,se
         start_time=-126
         [frame]
             duration=1
-            image={BASEFRAME_SE}
+            image={BASE_SE_IMAGE}
         [/frame]
         [frame]
             duration=100
-            image={REACTION_SE}
+            image={REACTION_SE_IMAGE}
         [/frame]
         [if]
             hits=hit
             [frame]
                 duration=150
-                image={REACTION_SE}
+                image={REACTION_SE_IMAGE}
                 sound={HITSOUND}
             [/frame]
         [/if]
@@ -159,12 +159,12 @@
             hits=miss,kill
             [frame]
                 duration=150
-                image={REACTION_SE}
+                image={REACTION_SE_IMAGE}
             [/frame]
         [/else]
         [frame]
             duration=1
-            image={BASEFRAME_SE}
+            image={BASE_SE_IMAGE}
         [/frame]
     [/defend]
     [defend]
@@ -172,17 +172,17 @@
         start_time=-126
         [frame]
             duration=1
-            image={BASEFRAME_NE}
+            image={BASE_NE_IMAGE}
         [/frame]
         [frame]
             duration=100
-            image={REACTION_NE}
+            image={REACTION_NE_IMAGE}
         [/frame]
         [if]
             hits=hit
             [frame]
                 duration=150
-                image={REACTION_NE}
+                image={REACTION_NE_IMAGE}
                 sound={HITSOUND}
             [/frame]
         [/if]
@@ -190,34 +190,34 @@
             hits=miss,kill
             [frame]
                 duration=150
-                image={REACTION_NE}
+                image={REACTION_NE_IMAGE}
             [/frame]
         [/else]
         [frame]
             duration=1
-            image={BASEFRAME_NE}
+            image={BASE_NE_IMAGE}
         [/frame]
     [/defend]
 #enddef
 
-#define DEFENSE_ANIM_DIRECTIONAL REACTION_SE BASEFRAME_SE REACTION_NE BASEFRAME_NE HITSOUND RANGE
+#define DEFENSE_ANIM_DIRECTIONAL_RANGE REACTION_SE_IMAGE BASE_SE_IMAGE REACTION_NE_IMAGE BASE_NE_IMAGE HITSOUND RANGE
     [defend]
         direction=sw,s,se
         range={RANGE}
         start_time=-126
         [frame]
             duration=1
-            image={BASEFRAME_SE}
+            image={BASE_SE_IMAGE}
         [/frame]
         [frame]
             duration=100
-            image={REACTION_SE}
+            image={REACTION_SE_IMAGE}
         [/frame]
         [if]
             hits=hit
             [frame]
                 duration=150
-                image={REACTION_SE}
+                image={REACTION_SE_IMAGE}
                 sound={HITSOUND}
             [/frame]
         [/if]
@@ -225,12 +225,12 @@
             hits=miss,kill
             [frame]
                 duration=150
-                image={REACTION_SE}
+                image={REACTION_SE_IMAGE}
             [/frame]
         [/else]
         [frame]
             duration=1
-            image={BASEFRAME_SE}
+            image={BASE_SE_IMAGE}
         [/frame]
     [/defend]
     [defend]
@@ -239,17 +239,17 @@
         start_time=-126
         [frame]
             duration=1
-            image={BASEFRAME_NE}
+            image={BASE_NE_IMAGE}
         [/frame]
         [frame]
             duration=100
-            image={REACTION_NE}
+            image={REACTION_NE_IMAGE}
         [/frame]
         [if]
             hits=hit
             [frame]
                 duration=150
-                image={REACTION_NE}
+                image={REACTION_NE_IMAGE}
                 sound={HITSOUND}
             [/frame]
         [/if]
@@ -257,12 +257,12 @@
             hits=miss,kill
             [frame]
                 duration=150
-                image={REACTION_NE}
+                image={REACTION_NE_IMAGE}
             [/frame]
         [/else]
         [frame]
             duration=1
-            image={BASEFRAME_NE}
+            image={BASE_NE_IMAGE}
         [/frame]
     [/defend]
 #enddef