Author: esr
Date: Thu Feb 11 15:57:19 2010
New Revision: 41157
URL: http://svn.gna.org/viewcvs/wesnoth?rev=41157&view=rev
Log:
More macro argument type abnnotations. No conflicts in mainline.
Modified:
trunk/data/core/terrain-graphics/tiles.cfg
trunk/data/tools/wesnoth/wmltools.py
Modified: trunk/data/core/terrain-graphics/tiles.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/tiles.cfg?rev=41157&r1=41156&r2=41157&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/tiles.cfg (original)
+++ trunk/data/core/terrain-graphics/tiles.cfg Thu Feb 11 15:57:19 2010
@@ -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})}
Modified: trunk/data/tools/wesnoth/wmltools.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/wmltools.py?rev=41157&r1=41156&r2=41157&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/wmltools.py (original)
+++ trunk/data/tools/wesnoth/wmltools.py Thu Feb 11 15:57:19 2010
@@ -145,7 +145,7 @@
# 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"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
