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

New WALL_ADJACENT_TRANSITION macro

Browse source 
like WALL_ADJACENT but avoids declaring base terrain inside it
this matches the other wall macros (e.g. NEW:WALL)
the two instances of this in terrain-graphics are switched to the new macro
incidentally reduces number of terrain_graphics rules by 1
This commit is contained in:
Simon Forsyth 2011-09-28 00:43:36 +00:00
parent eefe60f948
commit 8355eb92bc
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/core/terrain-graphics.cfg
View file

@ -381,6 +381,7 @@
{TERRAIN_BASE_RANDOM Uh cave/hills-variation}
{TERRAIN_BASE Xu* cave/wall-rough}
{KEEP_BASE Xo* walls/wall-stone-base}
{TERRAIN_BASE_RANDOM Qxua chasm/abyss}
{TERRAIN_BASE Qx* chasm/depths}
@ -642,8 +643,8 @@
{WALL_TRANSITION_LF Qx* (!,Qx*,Xv,_off^_usr) -90 ground chasm/regular}
# Stone wall transitions
{WALL_ADJACENT Xol (!,Xo*, Xu*) ANIMATION_10 walls/wall-stone-lit walls/wall-stone-base}
{WALL_ADJACENT Xo* (!,Xo*, Xu*) IMAGE_SINGLE walls/wall-stone walls/wall-stone-base}
{WALL_ADJACENT_TRANSITION Xol (!,Xo*, Xu*) ANIMATION_10 walls/wall-stone-lit}
{WALL_ADJACENT_TRANSITION Xo* (!,Xo*, Xu*) IMAGE_SINGLE walls/wall-stone}
#
# > B A S E T R A N S I T I O N S. <

10
data/core/terrain-graphics/misc.cfg
View file

@ -1266,10 +1266,8 @@
[/terrain_graphics]
#enddef
#define WALL_ADJACENT TERRAINLIST ADJACENT BUILDER IMAGESTEM BASE_NAME
#define WALL_ADJACENT_TRANSITION TERRAINLIST ADJACENT BUILDER IMAGESTEM
{DISABLE_TRANSITIONS ({TERRAINLIST})}
{KEEP_BASE ({TERRAINLIST}) {BASE_NAME}}
{WALL_ADJACENT_6 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_5 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
@ -1277,6 +1275,12 @@
{WALL_ADJACENT_3 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_2 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_1 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
#enddef
#define WALL_ADJACENT TERRAINLIST ADJACENT BUILDER IMAGESTEM BASE_NAME
{KEEP_BASE ({TERRAINLIST}) {BASE_NAME}}
{WALL_ADJACENT_TRANSITION ({TERRAINLIST}) ({ADJACENT}) ({BUILDER}) ({IMAGESTEM})}
# disable castle walls and cave
# note: commented out until these macros exist in trunk