From: NHOrus <jy6x2b32pie9@yahoo.com>
Date: Mon, 3 Jul 2017 02:59:57 +0000 (+0300)
Subject: Removed helper function
X-Git-Tag: takebird~81
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=e1f52f4e314e4135c52325ac55b207c6bf8a3451;p=open-adventure.git

Removed helper function
---

diff --git a/actions.c b/actions.c
index a6f686d..44fc201 100644
--- a/actions.c
+++ b/actions.c
@@ -1083,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. */
 {
@@ -1111,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];