TRoW: General cleanup

Clear variables, macros and comments
wesnoth · Oct 18, 2018 · 5be5d32 · 5be5d32
1 parent f594019
commit 5be5d32
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 14 deletions.
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
@@ -469,3 +469,5 @@
         {CLEAR_VARIABLE wesfolk_leader_store}
     [/event]
 [/scenario]
+
+#undef NORTH_GUARD
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
@@ -429,3 +429,5 @@ SW — The Midlands."
         [/message]
     [/event]
 [/scenario]
+
+#undef ESCAPE_VICTORY
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
@@ -655,3 +655,7 @@ Enter at Your Own Risk!"
         [/message]
     [/event]
 [/scenario]
+
+#undef TEMPLE_HELP
+#undef TEMPLE_TRAP
+#undef TEMPLE_LOOT
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
@@ -111,7 +111,7 @@
 
     [event]
         name=prestart
-        {CLEAR_VARIABLE last_done}
+        {CLEAR_VARIABLE last_done,escape_choice}
 
         {PLACE_IMAGE (scenery/temple1.png) 23 22}
         {PLACE_IMAGE (scenery/castle-ruins.png) 5 5}

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
@@ -314,7 +314,7 @@
             speaker=Burin the Lost
             message= _ "Finally, we’re getting out of this forest!"
         [/message]
-        {CLEAR_VARIABLE have_lady}
+        {CLEAR_VARIABLE have_lady,heal_amount}
         [endlevel]
             result=victory
             bonus=no

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
@@ -643,3 +643,6 @@
         [/allow_undo]
     [/event]
 [/scenario]
+
+#undef PETRIFIED
+#undef PETRIFIED_UNIT
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
@@ -186,18 +186,6 @@
         [/objectives]
     [/event]
 
-    #   [event]
-    #       name=moveto
-    #       [filter]
-    #           side=1
-    #           x=17
-    #           y=18
-    #       [/filter]
-    #
-    #       [remove_item]
-    #       [/remove_item]
-    #   [/event]
-
     [event]
         name=start
         [message]

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
@@ -574,3 +574,11 @@
         [/switch]
     [/event]
 [/scenario]
+
+#undef DRAGON
+#undef BEACH
+#undef HOLE
+#undef ISLE
+#undef QUEST_CHOICES
+#undef QUESTS
+#undef GREET
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
@@ -543,3 +543,5 @@
         [/message]
     [/event]
 [/scenario]
+
+#undef GOLD_TO_BADDIES
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
@@ -496,3 +496,7 @@
         [/message]
     [/event]
 [/scenario]
+
+#undef TEMP_LOOT
+#undef TEMP_QUEEN
+#undef TEMP_EMPTY
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
@@ -622,6 +622,7 @@
         [/message]
 
         {CLEAR_VARIABLE side_2_undead_backup_triggered,side_3_undead_backup_triggered,side_4_undead_backup_triggered,undead_spawns_so_far}
+        {CLEAR_VARIABLE xx1,yy1}
 
         [endlevel]
             result=victory

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
@@ -1631,3 +1631,5 @@
         [/message]
     [/event]
 [/scenario]
+
+#undef JEVGOLD