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

Redefine old terrain macro in terms of another.

Browse source 
Would like a way to mark it as deprecated.
This commit is contained in:
Simon Forsyth 2012-06-28 02:03:00 +00:00
parent 36b2f08f97
commit 259276c040
3 changed files with 9 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1267,7 +1267,7 @@
#enddef
#define WALL_ADJACENT_TRANSITION TERRAINLIST ADJACENT BUILDER IMAGESTEM
{DISABLE_TRANSITIONS ({TERRAINLIST})}
{DISABLE_BASE_TRANSITIONS ({TERRAINLIST})}
{WALL_ADJACENT_6 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_5 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}

8
data/core/terrain-graphics/transitions.cfg
View file

@ -18,6 +18,14 @@
{DISABLE_BASE_TRANSITIONS_F {TERRAINLIST} transition}
#enddef
# Legacy macro used for same purpose as DISABLE_BASE_TRANSITIONS.
# Kept for compatability.
#define DISABLE_TRANSITIONS TERRAIN_PATTERN
{DISABLE_BASE_TRANSITIONS ({TERRAIN_PATTERN})}
{DISABLE_BASE_TRANSITIONS_F ({TERRAIN_PATTERN}) overlay}
#enddef
# This macro disables wall-style transitions on a given terrain type. It is used
# for campaign specific castles and keeps that need to disable the default encampment
# transition without an image replacement.

43
data/core/terrain-graphics/util.cfg
View file

@ -1,43 +0,0 @@
#textdomain wesnoth
# This utility macro disables standard transitions on a given terrain type. It
# is used for castles and keeps, as those have custom transitions.
#define DISABLE_TRANSITIONS TERRAIN_PATTERN
[terrain_graphics]
map="
, 1
6, 2
, 7
5, 3
, 4"
[tile]
pos=1
set_flag=overlay-s,transition-s
[/tile]
[tile]
pos=2
set_flag=overlay-sw,transition-sw
[/tile]
[tile]
pos=3
set_flag=overlay-nw,transition-nw
[/tile]
[tile]
pos=4
set_flag=overlay-n,transition-n
[/tile]
[tile]
pos=5
set_flag=overlay-ne,transition-ne
[/tile]
[tile]
pos=6
set_flag=overlay-se,transition-se
[/tile]
[tile]
pos=7
type={TERRAIN_PATTERN}
[/tile]
[/terrain_graphics]
#enddef