Completed unspk'ing of vcarry.

diff --git a/actions.c b/actions.c
index 5689ad2c41d8862c8cf4525ae1b35d84304971e2..2ad4623dce25e693b44a01157d212629b2566731 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -337,7 +337,7 @@ static int vcarry(token_t verb, token_t obj)
         rspeak(YOU_JOKING);
         return GO_CLEAROBJ;
     }
         rspeak(YOU_JOKING);
         return GO_CLEAROBJ;
     }

-    int spk;
+

     if (obj == WATER ||
         obj == OIL) {
         if (!HERE(BOTTLE) ||
     if (obj == WATER ||
         obj == OIL) {
         if (!HERE(BOTTLE) ||


@@ -355,23 +355,24 @@ static int vcarry(token_t verb, token_t obj)
         obj = BOTTLE;
     }
 
         obj = BOTTLE;
     }
 

-    spk = CARRY_LIMIT;

     if (game.holdng >= INVLIMIT) {
     if (game.holdng >= INVLIMIT) {

-        rspeak(spk);
+        rspeak(CARRY_LIMIT);

         return GO_CLEAROBJ;
         return GO_CLEAROBJ;

-    } else if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && -1 - game.prop[BIRD] != BIRD_CAGED) {
+
+    }
+
+    if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && -1 - game.prop[BIRD] != BIRD_CAGED) {

         if (game.prop[BIRD] == BIRD_FOREST_UNCAGED) {
             DESTROY(BIRD);
             rspeak(BIRD_CRAP);
             return GO_CLEAROBJ;
         }
         if (game.prop[BIRD] == BIRD_FOREST_UNCAGED) {
             DESTROY(BIRD);
             rspeak(BIRD_CRAP);
             return GO_CLEAROBJ;
         }

-        if (!TOTING(CAGE))
-            spk = CANNOT_CARRY;
-        if (TOTING(ROD))
-            spk = BIRD_EVADES;
-        if (spk == CANNOT_CARRY ||
-            spk == BIRD_EVADES) {
-            rspeak(spk);
+        if (!TOTING(CAGE)) {
+            rspeak(CANNOT_CARRY);
+            return GO_CLEAROBJ;
+        }
+        if (TOTING(ROD)) {
+            rspeak(BIRD_EVADES);

             return GO_CLEAROBJ;
         }
         game.prop[BIRD] = BIRD_CAGED;
             return GO_CLEAROBJ;
         }
         game.prop[BIRD] = BIRD_CAGED;