Get riD of two syntactically unbalanced macros...

...and replace them with one that isn't.
This commit is contained in:
Eric S. Raymond 2007-06-29 07:24:07 +00:00
parent 6a8bcbec2a
commit a3ed36ed2c
2 changed files with 6 additions and 12 deletions

View File

@ -83,8 +83,9 @@
[/unit]
#enddef
# Ice randomly breaks and kills the unit. The event should filter out flying units
#define IF_ICE_BREAKS
# Ice randomly breaks and kills the unit (0.25 probability).
# This event should filter out flying units, but doesn't yet.
#define IF_ICE_BREAKS ACTION
[set_variable]
name=ice_random
random=1,2,3,4
@ -95,9 +96,7 @@
numerical_equals=1
[/variable]
[then]
#enddef
#define END_ICE_BREAKS
{ACTION}
[terrain]
letter=Wo
x,y=$x1,$y1
@ -115,7 +114,6 @@
{CLEAR_VARIABLE ice_random}
#enddef
# Create a new ghost-type "advisor" if Malin doesn't already have one
#define CREATE_ADVISOR
[recall]

View File

@ -156,9 +156,7 @@ victory_when_enemies_defeated=no
type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Vampire Bat,Blood Bat
[/not]
[/filter]
{IF_ICE_BREAKS}
{DIALOGUE_BOTR_ICE_UNDEAD}
{END_ICE_BREAKS}
{IF_ICE_BREAKS {DIALOGUE_BOTR_ICE_UNDEAD}}
[/event]
[event]
name=moveto
@ -173,9 +171,7 @@ victory_when_enemies_defeated=no
race=undead
[/not]
[/filter]
{IF_ICE_BREAKS}
{DIALOGUE_BOTR_ICE_LIVING}
{END_ICE_BREAKS}
{IF_ICE_BREAKS {DIALOGUE_BOTR_ICE_LIVING}}
[/event]
[/event]