Removed helper function

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 13fc8c5dfdf7bee165612b5c0e3b5af818b84231..44fc2012e3f7f8085b6db7f2e03c033f926bd2ff 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -20,9 +20,6 @@ static int attack(struct command_t *command)
     vocab_t verb = command->verb;
     vocab_t obj = command->obj;
 
-    if (obj == INTRANSITIVE) {
-        return GO_UNKNOWN;
-    }
     long spk = actions[verb].message;
     if (obj == NO_OBJECT || obj == INTRANSITIVE) {
         int changes = 0;
@@ -1086,16 +1083,6 @@ static int wake(token_t verb, token_t obj)
     }
 }
 
-static token_t birdspeak(void)
-{
-    switch (game.prop[BIRD]) {
-    case BIRD_CAGED:
-        return CAGE_FLY;
-    default:
-        return FREE_FLY;
-    }
-}
-
 static int wave(token_t verb, token_t obj)
 /* Wave.  No effect unless waving rod at fissure or at bird. */
 {
@@ -1114,15 +1101,15 @@ static int wave(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     } else {
         if (game.closed) {
-            rspeak(birdspeak());
+            rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
             return GO_DWARFWAKE;
         }
         if (game.closng || !AT(FISSURE)) {
-            rspeak(birdspeak());
+            rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
             return GO_CLEAROBJ;
         }
         if (HERE(BIRD))
-            rspeak(birdspeak());
+            rspeak((game.prop[BIRD] == BIRD_CAGED) ? CAGE_FLY : FREE_FLY);
 
         /* FIXME: Arithemetic on property values */
         game.prop[FISSURE] = 1 - game.prop[FISSURE];