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

Address bug #13007.

Browse source 
Ordinarily I'd be worried about the risk of UMC breakage from renaming
macros, but one of these was broken for a long time until recently so
we're probably not increasing any lossage here.
This commit is contained in:
Eric S. Raymond 2009-02-21 12:47:05 +00:00
parent 17e49133e5
commit 1248d14605
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/core/macros/interface-utils.cfg
View file

@ -206,21 +206,21 @@
[/label]
#enddef
#define SET_LABEL_PERSISTANT X Y STRING
#define SET_LABEL_PERSISTENT X Y STRING
# Sets a label on tile x,y that gets reset every sideturn in case
# someone clears it.
#
# Example:
#! {SET_LABEL_PERSISTANT 4 7 _ "There really will be dragons here!!"}
#! {SET_LABEL_PERSISTENT 4 7 _ "There really will be dragons here!!"}
{SET_LABEL {X} {Y} ({STRING}) }
{ON_SIDETURN (
{SET_LABEL {X} {Y} ({STRING}) }
)}
#enddef
#define SET_IMAGE_AND_LABEL_PERSISTANT X Y IMAGE STRING
#define SET_IMAGE_AND_LABEL_PERSISTENT X Y IMAGE STRING
# Shorthand for setting both a persistant label and image at once.
{SET_LABEL_PERSISTANT {X} {Y} ({STRING}) }
{SET_LABEL_PERSISTENT {X} {Y} ({STRING}) }
{PLACE_IMAGE ({IMAGE}) {X} {Y}}
#enddef

14
data/multiplayer/scenarios/6p_Team_Survival.cfg
View file

@ -197,13 +197,13 @@ usage=mask
# wmlindent: stop ignoring
#define TS_SET_LABELS
{SET_LABEL_PERSISTANT 24 18 (_ "Turn 2: Loyalists")}
{SET_LABEL_PERSISTANT 27 20 (_ "Turn 5: Knalgans")}
{SET_LABEL_PERSISTANT 27 23 (_ "Turn 8: Rebels")}
{SET_LABEL_PERSISTANT 24 24 (_ "Turn 11: Northerners")}
{SET_LABEL_PERSISTANT 21 23 (_ "Turn 14: Drakes")}
{SET_LABEL_PERSISTANT 21 20 (_ "Turn 17: Undead")}
{SET_LABEL_PERSISTANT 24 21 (_ "Tower of Doom")}
{SET_LABEL_PERSISTENT 24 18 (_ "Turn 2: Loyalists")}
{SET_LABEL_PERSISTENT 27 20 (_ "Turn 5: Knalgans")}
{SET_LABEL_PERSISTENT 27 23 (_ "Turn 8: Rebels")}
{SET_LABEL_PERSISTENT 24 24 (_ "Turn 11: Northerners")}
{SET_LABEL_PERSISTENT 21 23 (_ "Turn 14: Drakes")}
{SET_LABEL_PERSISTENT 21 20 (_ "Turn 17: Undead")}
{SET_LABEL_PERSISTENT 24 21 (_ "Tower of Doom")}
#enddef
#define TS_OPEN_WALLS

3
data/tools/wmllint
View file

@ -436,6 +436,9 @@ linechanges = (
"portraits/saurians/transparent/skirmisher.png"),
("portraits/Philip_Barber/transparent/undead-death-knight.png",
"portraits/undead/transparent/death-knight.png"),
# Changed just before 1.5.11
("LABEL_PERSISTANT", "LABEL_PERSISTENT"),
)
def validate_stack(stack, filename, lineno):