X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=4a7c514207ae74235e2a84fa9170e9fc1990436e;hp=ec7fb1c0a481d44d335da93ebe61e97e74cb7b41;hb=a802db1ce05b45de4107eeced0cc469ffea00781;hpb=acf303a57f389a42298f49ec3c6eb7bbc540e802 diff --git a/actions.c b/actions.c index ec7fb1c..4a7c514 100644 --- a/actions.c +++ b/actions.c @@ -557,31 +557,28 @@ static int eat(token_t verb, obj_t obj) /* Eat. Intransitive: assume food if present, else ask what. Transitive: food * ok, some things lose appetite, rest are ridiculous. */ { - if (obj == INTRANSITIVE) { + switch (obj) { + case INTRANSITIVE: if (!HERE(FOOD)) return GO_UNKNOWN; + case FOOD: DESTROY(FOOD); rspeak(THANKS_DELICIOUS); - return GO_CLEAROBJ; - } - if (obj == FOOD) { - DESTROY(FOOD); - rspeak(THANKS_DELICIOUS); - return GO_CLEAROBJ; - } - if (obj == BIRD || - obj == SNAKE || - obj == CLAM || - obj == OYSTER || - obj == DWARF || - obj == DRAGON || - obj == TROLL || - obj == BEAR || - obj == OGRE) { + break; + case BIRD: + case SNAKE: + case CLAM: + case OYSTER: + case DWARF: + case DRAGON: + case TROLL: + case BEAR: + case OGRE: rspeak(LOST_APPETITE); - return GO_CLEAROBJ; + break; + default: + speak(actions[verb].message); } - speak(actions[verb].message); return GO_CLEAROBJ; }