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

Partial terrain-macro argument type cleanup.

Browse source
This commit is contained in:
Eric S. Raymond 2010-06-02 00:05:09 +00:00
parent f4a42de37d
commit 98442423cd
3 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/core/terrain-graphics/internal-generic.cfg
View file

@ -179,7 +179,7 @@
#enddef
#
# TERRAIN ist next to at least two ADJACENT-hexes
# TERRAIN is next to at least two ADJACENT-hexes
#
#define GENERIC_RESTRICTED2_PLFB TERRAIN ADJACENT ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM ROTATION
{GENERIC_RESTRICTED2_N_NE_PLFB ({TERRAIN}) ({ADJACENT}) ({ADJACENT2}) {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM} {ROTATION}}

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

@ -655,7 +655,7 @@
#define OVERLAY_COMPLETE_L TERRAIN ADJACENT LAYER IMAGESTEM
{OVERLAY_COMPLETE_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define OVERLAY_COMPLETE TERRAIN ADJACENT IMAGESTEM
{OVERLAY_COMPLETE_LFB ({TERRAIN}) ({ADJACENT}) 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#define OVERLAY_COMPLETE TERRAIN_PATTERN ADJACENT IMAGESTEM
{OVERLAY_COMPLETE_LFB ({TERRAIN_PATTERN}) ({ADJACENT}) 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#end of generated code

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

@ -5,7 +5,7 @@
{CORNER_PLFB ({ADJACENT}) ({TERRAIN}) ({TERRAIN}) {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}-concave}
#enddef
#meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
#meta-macro WALL_TRANSITION TERRAIN_PATTERN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
#define WALL_TRANSITION2_PLFB TERRAIN1 TERRAIN2 ADJACENT PROB LAYER FLAG BUILDER IMAGESTEM
{CORNER_PLFB ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}-convex}
@ -25,52 +25,52 @@
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
#generated from: #meta-macro WALL_TRANSITION TERRAIN_PATTERN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
#Please do not modify
#define WALL_TRANSITION_LFB TERRAIN ADJACENT LAYER FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_LFB TERRAIN_PATTERN ADJACENT LAYER FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PFB TERRAIN ADJACENT PROB FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_PFB TERRAIN_PATTERN ADJACENT PROB FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_FB TERRAIN ADJACENT FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_FB TERRAIN_PATTERN ADJACENT FLAG BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 0 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PLB TERRAIN ADJACENT PROB LAYER BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_PLB TERRAIN_PATTERN ADJACENT PROB LAYER BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_LB TERRAIN ADJACENT LAYER BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_LB TERRAIN_PATTERN ADJACENT LAYER BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 ({LAYER}) overlay ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PB TERRAIN ADJACENT PROB BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_PB TERRAIN_PATTERN ADJACENT PROB BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) 0 overlay ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_B TERRAIN ADJACENT BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({BUILDER}) ({IMAGESTEM})}
#define WALL_TRANSITION_B TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 0 overlay ({BUILDER}) ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_PLF TERRAIN_PATTERN ADJACENT PROB LAYER FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_LF TERRAIN_PATTERN ADJACENT LAYER FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_PF TERRAIN_PATTERN ADJACENT PROB FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_F TERRAIN ADJACENT FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_F TERRAIN_PATTERN ADJACENT FLAG IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 0 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_PL TERRAIN_PATTERN ADJACENT PROB LAYER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_L TERRAIN ADJACENT LAYER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_L TERRAIN_PATTERN ADJACENT LAYER IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION_P TERRAIN ADJACENT PROB IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION_P TERRAIN_PATTERN ADJACENT PROB IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) ({PROB}) 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define WALL_TRANSITION TERRAIN ADJACENT IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN}) ({ADJACENT}) 100 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#define WALL_TRANSITION TERRAIN_PATTERN ADJACENT IMAGESTEM
{WALL_TRANSITION_PLFB ({TERRAIN_PATTERN}) ({ADJACENT}) 100 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#end of generated code
#The following code is autogenerated by expand-terrain-macros.py