archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify vase-dropping logic using state_change().

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-05 00:40:14 -04:00
parent 5ae09b9c34
commit 3d5c7239f1
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
actions.c
View file

@ -502,10 +502,9 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
game.loc == objects[PILLOW].plac) {
rspeak(OK_MAN);
} else {
game.prop[VASE] = VASE_BROKEN;
if (AT(PILLOW))
game.prop[VASE] = VASE_WHOLE;
pspeak(VASE, look, game.prop[VASE] + 1, true);
state_change(VASE, AT(PILLOW)
? VASE_WHOLE
: VASE_DROPPED);
if (game.prop[VASE] != VASE_WHOLE)
game.fixed[VASE] = -1;
}