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

Moved some of the carryover macro and preprocessor business into core.

Browse source
This commit is contained in:
Lari Nieminen 2008-09-27 20:57:24 +00:00
parent 518e4a8a83
commit 8184a479ba
3 changed files with 51 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
data/campaigns/Heir_To_The_Throne/_main.cfg
View file

@ -73,45 +73,6 @@
{campaigns/Heir_To_The_Throne/units}
[/units]
#ifdef EASYNEWCARRYOVER
#define EASY
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NORMALNEWCARRYOVER
#define NORMAL
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef HARDNEWCARRYOVER
#define HARD
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER_NOTE_40
_"
40% of finishing gold carried over to the next scenario."
#enddef
#else
#define NEW_GOLD_CARRYOVER_NOTE_40
""
#enddef
#endif
{campaigns/Heir_To_The_Throne/utils}
{campaigns/Heir_To_The_Throne/scenarios}
#endif

39
data/campaigns/Sceptre_of_Fire/_main.cfg
View file

@ -91,45 +91,6 @@ Their tale I now relate...
{@campaigns/Sceptre_of_Fire/units/}
[/units]
#ifdef EASYNEWCARRYOVER
#define EASY
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NORMALNEWCARRYOVER
#define NORMAL
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef HARDNEWCARRYOVER
#define HARD
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
20% of finishing gold carried over to the next scenario."
#enddef
#else
#define NEW_GOLD_CARRYOVER_NOTE_20
""
#enddef
#endif
{@campaigns/Sceptre_of_Fire/utils}
{@campaigns/Sceptre_of_Fire/scenarios}
#endif

51
data/core/macros/carryover-utils.cfg Normal file
View file

@ -0,0 +1,51 @@
# These aren't actually macros, but they need to go somewhere anyway.
#ifdef EASYNEWCARRYOVER
#define EASY
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NORMALNEWCARRYOVER
#define NORMAL
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef HARDNEWCARRYOVER
#define HARD
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
# These are used in scenarios, to include the carryover-defining keys into
# [endlevel]s and to show the carryover details in the objectives dialog.
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#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
#else
#define NEW_GOLD_CARRYOVER_NOTE_40
""
#enddef
#define NEW_GOLD_CARRYOVER_NOTE_20
""
#enddef
#endif