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

Unspk and streamline eat command

Browse source
This commit is contained in:
NHOrus 2017-07-03 06:07:57 +03:00
parent e1f52f4e31
commit 5613b0ce36
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
actions.c
View file

@ -518,23 +518,25 @@ static int eat(token_t verb, token_t obj)
/* Eat. Intransitive: assume food if present, else ask what. Transitive: food /* Eat. Intransitive: assume food if present, else ask what. Transitive: food
* ok, some things lose appetite, rest are ridiculous. */ * ok, some things lose appetite, rest are ridiculous. */
{ {
int spk = actions[verb].message;
if (obj == INTRANSITIVE) { if (obj == INTRANSITIVE) {
if (!HERE(FOOD)) if (!HERE(FOOD))
return GO_UNKNOWN; return GO_UNKNOWN;
DESTROY(FOOD); DESTROY(FOOD);
spk = THANKS_DELICIOUS; rspeak(THANKS_DELICIOUS);
} else { return GO_CLEAROBJ;
}
if (obj == FOOD) { if (obj == FOOD) {
DESTROY(FOOD); DESTROY(FOOD);
spk = THANKS_DELICIOUS; rspeak(THANKS_DELICIOUS);
return GO_CLEAROBJ;
} }
if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj == if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj == DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
OGRE) OGRE) {
spk = LOST_APPETITE; rspeak(LOST_APPETITE);
return GO_CLEAROBJ;
} }
rspeak(spk); rspeak(actions[verb].message);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }

2
tests/wakedwarves2.log
View file

@ -1,4 +1,4 @@
## Wake the dwarves and die. ## Wake the dwarves differently and die.
n n
seed 1838473132 seed 1838473132
in in