Author: esr
Date: Mon Sep 13 04:29:04 2010
New Revision: 46433
URL: http://svn.gna.org/viewcvs/wesnoth?rev=46433&view=rev
Log:
Still more typechecking in macros.
Modified:
trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
trunk/data/core/terrain-graphics/mountains.cfg
Modified: trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg?rev=46433&r1=46432&r2=46433&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg (original)
+++ trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg Mon Sep 13 04:29:04 2010
@@ -1,7 +1,7 @@
#textdomain wesnoth-dw
# Finds the nearest hex to (X,Y) within MAX_DISTANCE that matches the FILTER,
and stores the location in VARIABLE with x, y, and terrain. If there is more
than one location found, VARIABLE will be an array.
-#define NEAREST_HEX X Y MAX_DISTANCE FILTER VAR_NAME
+#define NEAREST_HEX X Y MAX_DISTANCE_NUMBER FILTER VAR_NAME
[set_variable]
name=distance
value=0
@@ -12,7 +12,7 @@
value=no
[/set_variable]
- # Store any matching locations within a radius of "distance". If nothing
got stored, add one to "distance" and try again. Do this until a location is
found, or "distance" goes over the MAX_DISTANCE.
+ # Store any matching locations within a radius of "distance". If nothing
got stored, add one to "distance" and try again. Do this until a location is
found, or "distance" goes over the MAX_DISTANCE_NUMBER.
[while]
[variable]
name=location_found
@@ -21,7 +21,7 @@
[and]
[variable]
name=distance
- less_than_equal_to={MAX_DISTANCE}
+ less_than_equal_to={MAX_DISTANCE_NUMBER}
[/variable]
[/and]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg?rev=46433&r1=46432&r2=46433&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
Mon Sep 13 04:29:04 2010
@@ -232,17 +232,17 @@
{HIGHLIGHT_IMAGE 20 21 items/chest.png ()}
[/event]
-#define TREASURE_CHEST LOCATION
+#define TREASURE_CHEST POSITION
[item]
image=items/chest.png
- x,y={LOCATION}
+ x,y={POSITION}
[/item]
[event]
name=moveto
delayed_variable_substitution=no
[filter]
- x,y={LOCATION}
+ x,y={POSITION}
type=Elvish Scout, Elvish Outrider, Elvish Rider
[/filter]
@@ -257,18 +257,18 @@
[/effect]
duration=level
[filter]
- x,y={LOCATION}
+ x,y={POSITION}
[/filter]
[then]
[removeitem]
image=items/chest.png
[/removeitem]
[role]
- x,y={LOCATION}
+ x,y={POSITION}
role=gold_carrier
[/role]
[unit_overlay]
- x,y={LOCATION}
+ x,y={POSITION}
image=items/gold-coins-small.png
[/unit_overlay]
[/then]
Modified: trunk/data/core/terrain-graphics/mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/mountains.cfg?rev=46433&r1=46432&r2=46433&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/mountains.cfg (original)
+++ trunk/data/core/terrain-graphics/mountains.cfg Mon Sep 13 04:29:04 2010
@@ -295,7 +295,7 @@
[/terrain_graphics]
#enddef
-#define VOLCANO_2x2 TERRAIN SURROUNDING_TERRAINLIST PROB FLAG IMAGESTEM
+#define VOLCANO_2x2 TERRAIN ADJACENT PROB FLAG IMAGESTEM
[terrain_graphics]
map="
., *, ., .
@@ -315,7 +315,7 @@
[tile]
pos=2
- type={SURROUNDING_TERRAINLIST}
+ type={ADJACENT}
set_no_flag={FLAG}
[/tile]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
