Author: zookeeper
Date: Sun Nov 2 11:47:13 2008
New Revision: 30527
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30527&view=rev
Log:
Hopefully fixed bug #12556 and got rid of the hideous FOREACH_FORMAT and FORMAT
macros.
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
trunk/data/campaigns/Sceptre_of_Fire/utils/utils.cfg
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg?rev=30527&r1=30526&r2=30527&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg Sun
Nov 2 11:47:13 2008
@@ -638,14 +638,14 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
fire_event=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
[clear_variable]
name=lavadead
[/clear_variable]
@@ -710,13 +710,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava 4
[terrain_mask]
x,y=1,1
@@ -735,13 +735,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava 5
[terrain_mask]
x,y=1,1
@@ -760,13 +760,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava 6
[terrain_mask]
x,y=1,1
@@ -785,13 +785,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava 7
[terrain_mask]
x,y=1,1
@@ -810,13 +810,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#and then you win
[endlevel]
result=continue_no_save
@@ -868,13 +868,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava 9
[terrain_mask]
x,y=1,1
@@ -893,13 +893,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#lava final
[terrain_mask]
x,y=1,1
@@ -918,13 +918,13 @@
terrain=Chw,Ql
variable=lavadead
[/store_locations]
- {FOREACH_FORMAT lavadead i}
+ {FOREACH lavadead i}
[kill]
- x=$lavadead_i_x
- y=$lavadead_i_y
+ x=$lavadead[$i].x
+ y=$lavadead[$i].y
animate=yes
[/kill]
- {NEXT_FORMAT i}
+ {NEXT i}
#clear the variable
[clear_variable]
name=lavadead
Modified: trunk/data/campaigns/Sceptre_of_Fire/utils/utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/utils/utils.cfg?rev=30527&r1=30526&r2=30527&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/utils/utils.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/utils/utils.cfg Sun Nov 2 11:47:13
2008
@@ -89,28 +89,6 @@
[/event]
#enddef
-#define FORMAT VARIABLE TEMP_VARIABLE ELEMENT
- [set_variable]
- name={VARIABLE}_{TEMP_VARIABLE}_{ELEMENT}
- to_variable={VARIABLE}[${TEMP_VARIABLE}].{ELEMENT}
- [/set_variable]
-#enddef
-
-#wmlindent: start ignoring
-#define FOREACH_FORMAT VARIABLE TEMP_VARIABLE
- {FOREACH {VARIABLE} {TEMP_VARIABLE}}
- {FORMAT {VARIABLE} {TEMP_VARIABLE} x}
- {FORMAT {VARIABLE} {TEMP_VARIABLE} y}
-#enddef
-
-#define NEXT_FORMAT VARIABLE
- {NEXT VARIABLE}
-#enddef
-#wmlindent: stop ignoring
-
-# wmlindent: opener "{FOREACH_FORMAT "
-# wmlindent: closer "{NEXT_FORMAT "
-
#define ROLEMACRO X
[role]
role=temp{X}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
