Refactor carryover definitions...

...so that only one is visible to wmlscope at any given time.
This commit is contained in:
Eric S. Raymond 2008-10-05 10:11:01 +00:00
parent 902e607ea1
commit 385f38fcd6

View file

@ -3,6 +3,8 @@
# The wmlscope pragmas prevent spurious complaints about multiple definitions
# wmlscope: start ignoring
#ifdef EASYNEWCARRYOVER
#define EASY
#enddef
@ -10,8 +12,6 @@
#enddef
#endif
# wmlscope: start ignoring
#ifdef NORMALNEWCARRYOVER
#define NORMAL
#enddef
@ -31,14 +31,15 @@
# These are used in scenarios, to include the carryover-defining keys into
# [endlevel]s and to show the carryover details in the objectives dialog.
#define NEW_GOLD_CARRYOVER PERCENTAGE
#enddef
#ifdef NEW_GOLD_CARRYOVER_USED
#undef NEW_GOLD_CARRYOVER
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#else
#define NEW_GOLD_CARRYOVER PERCENTAGE
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED