Eric S. Raymond 1f1fc2164f Re-enable macro argument type checking, and fix some glitches it turns up.
Most changes in this diff just rename macro formal args so they match
what the type checker expects.
2008-06-09 16:25:13 +00:00

134 lines
7.7 KiB
INI

#textdomain wesnoth
#define WALL_TRANSITION_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
{CORNER_OVERLAY_PLF ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-convex}
{CORNER_OVERLAY_PLF ({ADJACENT}) ({TERRAIN}) ({TERRAIN}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-concave}
#enddef
#meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#define WALL_TRANSITION2_PLF TERRAIN1 TERRAIN2 ADJACENT PROB LAYER FLAG IMAGESTEM
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-convex}
{CORNER_OVERLAY_PLF ({TERRAIN2}) ({TERRAIN1}) ({TERRAIN1}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-concave}
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-cw}
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({ADJACENT}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-ccw}
#enddef
#meta-macro WALL_TRANSITION2 TERRAIN1 TERRAIN2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#define WALL_TRANSITION3_PLF TERRAIN1 TERRAIN2 TERRAIN3 PROB LAYER FLAG IMAGESTEM
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-cw}
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN3}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-ccw}
#enddef
#meta-macro WALL_TRANSITION3 TERRAIN1 TERRAIN2 TERRAIN3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#define SIMPLE_OVERLAY_TERRAIN TERRAINLIST RESTRICTING IMAGESTEM
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
{OVERLAY_RESTRICTED3 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
{TRANSITION_RESTRICTED2 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}}
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
{OVERLAY_RESTRICTED2 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
{TRANSITION_RESTRICTED ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}}
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
{OVERLAY_RESTRICTED ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
{OVERLAY_P ({TERRAINLIST}) 16 {IMAGESTEM}-6}
{OVERLAY_P ({TERRAINLIST}) 20 {IMAGESTEM}-5}
{OVERLAY_P ({TERRAINLIST}) 25 {IMAGESTEM}-4}
{OVERLAY_P ({TERRAINLIST}) 33 {IMAGESTEM}-3}
{OVERLAY_P ({TERRAINLIST}) 50 {IMAGESTEM}-2}
{OVERLAY ({TERRAINLIST}) {IMAGESTEM}}
#enddef
#define VILLAGE_P TERRAIN PROB IMAGESTEM
{OVERLAY_PLF ({TERRAIN}) {PROB} 0 village {IMAGESTEM} }
#enddef
#define VILLAGE TERRAIN IMAGESTEM
{OVERLAY_PLF ({TERRAIN}) 100 0 village {IMAGESTEM} }
#enddef
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro WALL_TRANSITION TERRAINLIST ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#Please do not modify
#define WALL_TRANSITION_LF TERRAINLIST ADJACENT LAYER FLAG IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PF TERRAINLIST ADJACENT PROB FLAG IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_F TERRAINLIST ADJACENT FLAG IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_L TERRAINLIST ADJACENT LAYER IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_P TERRAINLIST ADJACENT PROB IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION TERRAINLIST ADJACENT IMAGESTEM
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
#enddef
#end of generated code
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro WALL_TRANSITION2 TERRAINLIST1 TERRAINLIST2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#Please do not modify
#define WALL_TRANSITION2_LF TERRAINLIST1 TERRAINLIST2 ADJACENT LAYER FLAG IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2_PF TERRAINLIST1 TERRAINLIST2 ADJACENT PROB FLAG IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2_F TERRAINLIST1 TERRAINLIST2 ADJACENT FLAG IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2_PL TERRAINLIST1 TERRAINLIST2 ADJACENT PROB LAYER IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2_L TERRAINLIST1 TERRAINLIST2 ADJACENT LAYER IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2_P TERRAINLIST1 TERRAINLIST2 ADJACENT PROB IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION2 TERRAINLIST1 TERRAINLIST2 ADJACENT IMAGESTEM
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
#enddef
#end of generated code
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro WALL_TRANSITION3 TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
#Please do not modify
#define WALL_TRANSITION3_LF TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 LAYER FLAG IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3_PF TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB FLAG IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3_F TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 FLAG IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 0 ({FLAG}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3_PL TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB LAYER IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3_L TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 LAYER IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 ({LAYER}) overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3_P TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) 0 overlay ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION3 TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 IMAGESTEM
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 0 overlay ({IMAGESTEM})}
#enddef
#end of generated code