X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=52c041791f6c67b90574dfb79a86c03268b2f419;hp=5dfb987a74f8e92ce02edd9ca36bb3defd1591b0;hb=38970a1c98b3b9cd3e74c240e6662f090849758a;hpb=5613b0ce36636d421cfa3002d39aeb0e2f69e389

diff --git a/actions.c b/actions.c
index 5dfb987..52c0417 100644
--- a/actions.c
+++ b/actions.c
@@ -873,33 +873,30 @@ static int pour(token_t verb, token_t obj)
 /*  Pour.  If no object, or object is bottle, assume contents of bottle.
  *  special tests for pouring water or oil on plant or rusty door. */
 {
-    int spk = actions[verb].message;
     if (obj == BOTTLE || obj == NO_OBJECT)
         obj = LIQUID();
     if (obj == NO_OBJECT)
         return GO_UNKNOWN;
     if (!TOTING(obj)) {
-        rspeak(spk);
+        rspeak(actions[verb].message);
         return GO_CLEAROBJ;
     }
-    spk = CANT_POUR;
+
     if (obj != OIL && obj != WATER) {
-        rspeak(spk);
+        rspeak(CANT_POUR);
         return GO_CLEAROBJ;
     }
     if (HERE(URN) && game.prop[URN] == URN_EMPTY)
         return fill(verb, URN);
     game.prop[BOTTLE] = EMPTY_BOTTLE;
     game.place[obj] = LOC_NOWHERE;
-    spk = GROUND_WET;
     if (!(AT(PLANT) || AT(DOOR))) {
-        rspeak(spk);
+        rspeak(GROUND_WET);
         return GO_CLEAROBJ;
     }
     if (!AT(DOOR)) {
-        spk = SHAKING_LEAVES;
         if (obj != WATER) {
-            rspeak(spk);
+            rspeak(SHAKING_LEAVES);
             return GO_CLEAROBJ;
         }
         pspeak(PLANT, look, game.prop[PLANT] + 3, true);