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

Code simplification.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-13 11:28:53 -04:00
parent c9abf8243c
commit 6166d687b9
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
actions.c
View file

@ -392,13 +392,11 @@ static int drink(token_t verb, token_t obj)
return(8000); return(8000);
if (obj != BLOOD) { if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=110; if (obj != 0 && obj != WATER)spk=110;
if (spk == 110 || LIQUID() != WATER || !HERE(BOTTLE)) { if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
game.prop[BOTTLE]=1; game.prop[BOTTLE]=1;
game.place[WATER]=0; game.place[WATER]=0;
spk=74; spk=74;
}
} else { } else {
DSTROY(BLOOD); DSTROY(BLOOD);
game.prop[DRAGON]=2; game.prop[DRAGON]=2;