0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More macro argument type checking. No mismatches in mainline.

Browse source
This commit is contained in:
Eric S. Raymond 2010-02-12 13:19:30 +00:00
parent 10d109876f
commit 1ba88575e2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/core/terrain-graphics/walls.cfg
View file

@ -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}}

2
data/tools/wesnoth/wmltools.py
View file

@ -147,7 +147,7 @@ def formaltype(f):
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"