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

Cleaned up eat

Browse source
This commit is contained in:
NHOrus 2017-07-06 10:18:18 +03:00
parent acf303a57f
commit a802db1ce0
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
actions.c
View file

@ -557,31 +557,28 @@ static int eat(token_t verb, obj_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. */
{ {
if (obj == INTRANSITIVE) { switch (obj) {
case INTRANSITIVE:
if (!HERE(FOOD)) if (!HERE(FOOD))
return GO_UNKNOWN; return GO_UNKNOWN;
case FOOD:
DESTROY(FOOD); DESTROY(FOOD);
rspeak(THANKS_DELICIOUS); rspeak(THANKS_DELICIOUS);
return GO_CLEAROBJ; break;
} case BIRD:
if (obj == FOOD) { case SNAKE:
DESTROY(FOOD); case CLAM:
rspeak(THANKS_DELICIOUS); case OYSTER:
return GO_CLEAROBJ; case DWARF:
} case DRAGON:
if (obj == BIRD || case TROLL:
obj == SNAKE || case BEAR:
obj == CLAM || case OGRE:
obj == OYSTER ||
obj == DWARF ||
obj == DRAGON ||
obj == TROLL ||
obj == BEAR ||
obj == OGRE) {
rspeak(LOST_APPETITE); rspeak(LOST_APPETITE);
return GO_CLEAROBJ; break;
} default:
speak(actions[verb].message); speak(actions[verb].message);
}
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }