Deprecate obsolete objective macros

The functionality of these macros is now handled internally by the objectives dialog,
and no longer need to be included manually
This commit is contained in:
Charles Dang 2015-03-25 03:35:15 +11:00
parent db4b82e3f4
commit e945b99bc5
2 changed files with 22 additions and 23 deletions

View file

@ -16,6 +16,27 @@
# Deprecated; use the below EARLY_FINISH_BONUS_FOOTNOTE instead
_"<small>(early finish bonus)</small>"#enddef
#define EARLY_FINISH_BONUS_NOTE
_"Early finish bonus."#enddef
#define NO_EARLY_FINISH_BONUS_NOTE
_"No early finish bonus."#enddef
#define NO_GOLD_CARRYOVER_NOTE
_"No gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_100
_"
100% of finishing gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_40
_"
40% of finishing gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
20% of finishing gold carried over to the next scenario."#enddef
#define MISSILE_FRAME_FIREBALL
# Deprecated; use MISSILE_FRAME_FIREBALL_XY X_OFFSET Y_OFFSET instead
{MISSILE_FRAME_FIREBALL_XY 0 0}

View file

@ -1,6 +1,5 @@
#textdomain wesnoth
# Utility macros for use in the objectives dialog or for defining the whole
# [objectives] tag.
# Utility macros for use in the objectives dialog
#define TURNS_RUN_OUT
[objective]
@ -10,32 +9,11 @@
[/objective]
#enddef
#define EARLY_FINISH_BONUS_NOTE
_"Early finish bonus."#enddef
#define NO_EARLY_FINISH_BONUS_NOTE
_"No early finish bonus."#enddef
#wmllint: markcheck off
#define EARLY_FINISH_BONUS_FOOTNOTE
"<span foreground='white'><small> " + _"(early finish bonus)" + "</small></span>"#enddef
#wmllint: markcheck on
#define NO_GOLD_CARRYOVER_NOTE
_"No gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_100
_"
100% of finishing gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_40
_"
40% of finishing gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
20% of finishing gold carried over to the next scenario."#enddef
#define OBJECTIVE_FOOTNOTE TEXT
"<span foreground='white'><small> " + {TEXT} + "</small></span>"
#enddef