Author: esr
Date: Fri Feb 12 14:19:30 2010
New Revision: 41169
URL: http://svn.gna.org/viewcvs/wesnoth?rev=41169&view=rev
Log:
More macro argument type checking. No mismatches in mainline.
Modified:
trunk/data/core/terrain-graphics/walls.cfg
trunk/data/tools/wesnoth/wmltools.py
Modified: trunk/data/core/terrain-graphics/walls.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/walls.cfg?rev=41169&r1=41168&r2=41169&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/walls.cfg (original)
+++ trunk/data/core/terrain-graphics/walls.cfg Fri Feb 12 14:19:30 2010
@@ -1353,10 +1353,10 @@
[/terrain_graphics]
#enddef
-#define WALL_ADJACENT TERRAIN_PATTERN ADJACENT IMAGESTEM BASE
+#define WALL_ADJACENT TERRAIN_PATTERN ADJACENT IMAGESTEM BASE_NAME
{DISABLE_TRANSITIONS ({TERRAIN_PATTERN})}
- {KEEP_BASE ({TERRAIN_PATTERN}) {BASE}}
+ {KEEP_BASE ({TERRAIN_PATTERN}) {BASE_NAME}}
{WALL_ADJACENT_6 ({TERRAIN_PATTERN}) ({ADJACENT}) {IMAGESTEM}}
{WALL_ADJACENT_5 ({TERRAIN_PATTERN}) ({ADJACENT}) {IMAGESTEM}}
Modified: trunk/data/tools/wesnoth/wmltools.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/wmltools.py?rev=41169&r1=41168&r2=41169&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/wmltools.py (original)
+++ trunk/data/tools/wesnoth/wmltools.py Fri Feb 12 14:19:30 2010
@@ -147,7 +147,7 @@
f = f[1:]
if f in ("SIDE", "X", "Y", "RED", "GREEN", "BLUE", "TURN", "RADIUS",
"PROB", "LAYER", "TIME") or f.endswith("_SIDE") or f.endswith("NUMBER") or
f.endswith("AMOUNT") or f.endswith("COST") or f.endswith("_X") or
f.endswith("_Y") or f.endswith("_INCREMENT") or f.endswith("_FACTOR") or
f.endswith("_TIME"):
ftype = "numeric"
- elif f in ("POSITION",) or f.endswith("_POSITION"):
+ elif f in ("POSITION",) or f.endswith("_POSITION") or f == "BASE":
ftype = "position"
elif f.endswith("_SPAN"):
ftype = "span"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
