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

More macro argument type abnnotations. No conflicts in mainline.

Browse source
This commit is contained in:
Eric S. Raymond 2010-02-11 14:57:19 +00:00
parent ca2f6c893f
commit 8992dccdbd
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/tiles.cfg
View file

@ -84,8 +84,8 @@
#define OVERLAY_LF TERRAINLIST LAYER FLAG IMAGESTEM
{OVERLAY_PLF ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
#enddef
#define OVERLAY_PF TERRAINLIST PROB FLAG IMAGESTEM
{OVERLAY_PLF ({TERRAINLIST}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
#define OVERLAY_PF TERRAINLIST FRAC FLAG IMAGESTEM
{OVERLAY_PLF ({TERRAINLIST}) ({FRAC}) 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define OVERLAY_F TERRAINLIST FLAG IMAGESTEM
{OVERLAY_PLF ({TERRAINLIST}) 100 0 ({FLAG}) ({IMAGESTEM})}

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

@ -145,7 +145,7 @@ def formaltype(f):
# Deduce the expected type of the formal
if f.startswith("_"):
f = f[1:]
if f in ("SIDE", "X", "Y", "RED", "GREEN", "BLUE", "TURN", "RADIUS") 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"):
if f in ("SIDE", "X", "Y", "RED", "GREEN", "BLUE", "TURN", "RADIUS", "PROB") 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"):
ftype = "numeric"
elif f in ("POSITION",):
ftype = "position"