[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth Temp...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/08/31 01:17:00

Modified files:
        data/scenarios/The_Rise_of_Wesnoth: Temple_of_the_Deep.cfg 
                                            trow-macros.cfg 

Log message:
        Move RISE_UP_RISE_UP to trow-macros

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.13 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.14
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.13      
Tue Aug 24 03:03:14 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg   Tue Aug 
31 01:17:00 2004
@@ -341,49 +341,6 @@
                {CLEAR_VARIABLE Have_Ruby}
        [/event]
 
-#define RISE_UP_RISE_UP X Y
-               [filter]
-                       side=1
-               [/filter]
-               [filter_second]
-                       side=2
-                       [not]
-                               description=A Former Friend
-                       [/not]
-               [/filter_second]
-
-#ifdef EASY
-               [unit]
-                       description=A Former Friend
-                       type=Walking Corpse
-                       side=2
-                       x={X}
-                       y={Y}
-                       moves=0
-               [/unit]
-#endif
-#ifdef NORMAL
-               [unit]
-                       description=A Former Friend
-                       type=Soulless
-                       side=2
-                       x={X}
-                       y={Y}
-                       moves=0
-               [/unit]
-#endif
-#ifdef HARD
-               [unit]
-                       description=A Former Friend
-                       type=Ghoul
-                       side=2
-                       x={X}
-                       y={Y}
-                       moves=0
-               [/unit]
-#endif
-#enddef
-
        [event]
                name=die
                first_time_only=no
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.3 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.4
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.3      Sun Aug 
 1 23:08:00 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg  Tue Aug 31 
01:17:00 2004
@@ -6,6 +6,7 @@
 #GUARD_UNIT
 #UNIT
 #PUT_IMG
+#RISE_UP_RISE_UP
 
 #define LOOT AMOUNT SIDE
        [command]
@@ -52,5 +53,47 @@
                y={Y}
                image={IMG}
        [/item]
+#enddef
+
+#define RISE_UP_RISE_UP X Y
+               [filter]
+                       side=1
+               [/filter]
+               [filter_second]
+                       side=2
+                       [not]
+                               description=A Former Friend
+                       [/not]
+               [/filter_second]
 
+#ifdef EASY
+               [unit]
+                       description=A Former Friend
+                       type=Walking Corpse
+                       side=2
+                       x={X}
+                       y={Y}
+                       moves=0
+               [/unit]
+#endif
+#ifdef NORMAL
+               [unit]
+                       description=A Former Friend
+                       type=Soulless
+                       side=2
+                       x={X}
+                       y={Y}
+                       moves=0
+               [/unit]
+#endif
+#ifdef HARD
+               [unit]
+                       description=A Former Friend
+                       type=Ghoul
+                       side=2
+                       x={X}
+                       y={Y}
+                       moves=0
+               [/unit]
+#endif
 #enddef