X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=c05cfb0ffd3fd2710776dd6b9ea5b464caa516a5;hp=a6f686d5115477059387e896308e65a9d498e08d;hb=16a175bbabffe66a68eeab1ca4ac0703553fdf56;hpb=9b3be62aaa87833420b0ab356c1d4390e9455a1b

diff --git a/actions.c b/actions.c
index a6f686d..c05cfb0 100644
--- a/actions.c
+++ b/actions.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <string.h>
 #include "advent.h"
 #include "dungeon.h"
 
@@ -21,7 +22,8 @@ static int attack(struct command_t *command)
     vocab_t obj = command->obj;
 
     long spk = actions[verb].message;
-    if (obj == NO_OBJECT || obj == INTRANSITIVE) {
+    if (obj == NO_OBJECT ||
+        obj == INTRANSITIVE) {
         int changes = 0;
         if (atdwrf(game.loc) > 0) {
             obj = DWARF;
@@ -84,7 +86,8 @@ static int attack(struct command_t *command)
 
     if (obj == NO_OBJECT)
         spk = NO_TARGET;
-    if (obj == CLAM || obj == OYSTER)
+    if (obj == CLAM ||
+        obj == OYSTER)
         spk = SHELL_IMPERVIOUS;
     if (obj == SNAKE)
         spk = SNAKE_WARNING;
@@ -110,7 +113,9 @@ static int attack(struct command_t *command)
                 game.dseen[i] = false;
             }
         }
-        spk = (dwarves > 1) ? OGRE_PANIC1 : OGRE_PANIC2;
+        spk = (dwarves > 1) ?
+              OGRE_PANIC1 :
+              OGRE_PANIC2;
     } else if (obj == BEAR) {
         switch (game.prop[BEAR]) {
         case UNTAMED_BEAR:
@@ -150,7 +155,8 @@ static int attack(struct command_t *command)
         move(RUG, k);
         drop(BLOOD, k);
         for (obj = 1; obj <= NOBJECTS; obj++) {
-            if (game.place[obj] == objects[DRAGON].plac || game.place[obj] == objects[DRAGON].fixd)
+            if (game.place[obj] == objects[DRAGON].plac ||
+                game.place[obj] == objects[DRAGON].fixd)
                 move(obj, k);
         }
         game.loc = k;
@@ -166,14 +172,15 @@ static int bigwords(token_t foo)
  *  Look up foo in special section of vocab to determine which word we've got.
  *  Last word zips the eggs back to the giant room (unless already there). */
 {
-    char word[6];
+    char word[TOKLEN + 1];
     packed_to_token(foo, word);
     int k = (int) get_special_vocab_id(word);
-    int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
-        if (game.foobar != 0 && game.loc == LOC_GIANTROOM)
-            spk = START_OVER;
-        rspeak(spk);
+        if (game.foobar != 0 && game.loc == LOC_GIANTROOM) {
+            rspeak( START_OVER);
+        } else {
+            rspeak(NOTHING_HAPPENS);
+        }
         return GO_CLEAROBJ;
     } else {
         game.foobar = k;
@@ -182,8 +189,9 @@ static int bigwords(token_t foo)
             return GO_CLEAROBJ;
         }
         game.foobar = 0;
-        if (game.place[EGGS] == objects[EGGS].plac || (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
-            rspeak(spk);
+        if (game.place[EGGS] == objects[EGGS].plac ||
+            (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
+            rspeak(NOTHING_HAPPENS);
             return GO_CLEAROBJ;
         } else {
             /*  Bring back troll if we steal the eggs back from him before
@@ -202,31 +210,11 @@ static int bigwords(token_t foo)
     }
 }
 
-static int bivalve(token_t verb, token_t obj)
-/* Clam/oyster actions */
-{
-    int spk;
-    bool is_oyster = (obj == OYSTER);
-    spk = is_oyster ? OYSTER_OPENS : PEARL_FALLS;
-    if (TOTING(obj))
-        spk = is_oyster ? DROP_OYSTER : DROP_CLAM;
-    if (!TOTING(TRIDENT))
-        spk = is_oyster ? OYSTER_OPENER : CLAM_OPENER;
-    if (verb == LOCK)
-        spk = HUH_MAN;
-    if (spk == PEARL_FALLS) {
-        DESTROY(CLAM);
-        drop(OYSTER, game.loc);
-        drop(PEARL, LOC_CULDESAC);
-    }
-    rspeak(spk);
-    return GO_CLEAROBJ;
-}
-
 static void blast(void)
 /*  Blast.  No effect unless you've got dynamite, which is a neat trick! */
 {
-    if (game.prop[ROD2] < 0 || !game.closed)
+    if (game.prop[ROD2] < 0 ||
+        !game.closed)
         rspeak(REQUIRES_DYNAMITE);
     else {
         game.bonus = VICTORY_MESSAGE;
@@ -316,8 +304,10 @@ static int vcarry(token_t verb, token_t obj)
         rspeak(spk);
         return GO_CLEAROBJ;
     }
-    if (obj == WATER || obj == OIL) {
-        if (!HERE(BOTTLE) || LIQUID() != obj) {
+    if (obj == WATER ||
+        obj == OIL) {
+        if (!HERE(BOTTLE) ||
+            LIQUID() != obj) {
             if (TOTING(BOTTLE) && game.prop[BOTTLE] == EMPTY_BOTTLE)
                 return (fill(verb, BOTTLE));
             else {
@@ -346,13 +336,18 @@ static int vcarry(token_t verb, token_t obj)
             spk = CANNOT_CARRY;
         if (TOTING(ROD))
             spk = BIRD_EVADES;
-        if (spk == CANNOT_CARRY || spk == BIRD_EVADES) {
+        if (spk == CANNOT_CARRY ||
+            spk == BIRD_EVADES) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.prop[BIRD] = BIRD_CAGED;
     }
-    if ((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == BIRD_CAGED || -1 - game.prop[BIRD] == 1))
+    /* FIXME: Arithmetic on state numbers */
+    if ((obj == BIRD ||
+         obj == CAGE) &&
+        (game.prop[BIRD] == BIRD_CAGED ||
+         -1 - game.prop[BIRD] == 1))
         carry(BIRD + CAGE - obj, game.loc);
     carry(obj, game.loc);
     if (obj == BOTTLE && LIQUID() != 0)
@@ -368,39 +363,47 @@ static int vcarry(token_t verb, token_t obj)
 static int chain(token_t verb)
 /* Do something to the bear's chain */
 {
-    int spk;
     if (verb != LOCK) {
-        spk = CHAIN_UNLOCKED;
-        if (game.prop[BEAR] == UNTAMED_BEAR)
-            spk = BEAR_BLOCKS;
-        if (game.prop[CHAIN] == CHAIN_HEAP)
-            spk = ALREADY_UNLOCKED;
-        if (spk != CHAIN_UNLOCKED) {
-            rspeak(spk);
+        if (game.prop[BEAR] == UNTAMED_BEAR) {
+            rspeak(BEAR_BLOCKS);
+            return GO_CLEAROBJ;
+        }
+        if (game.prop[CHAIN] == CHAIN_HEAP) {
+            rspeak(ALREADY_UNLOCKED);
             return GO_CLEAROBJ;
         }
         game.prop[CHAIN] = CHAIN_HEAP;
         game.fixed[CHAIN] = CHAIN_HEAP;
         if (game.prop[BEAR] != BEAR_DEAD)
             game.prop[BEAR] = CONTENTED_BEAR;
-        /* FIXME: Arithmetic on state numbers */
-        game.fixed[BEAR] = 2 - game.prop[BEAR];
-    } else {
-        spk = CHAIN_LOCKED;
-        if (game.prop[CHAIN] != CHAIN_HEAP)
-            spk = ALREADY_LOCKED;
-        if (game.loc != objects[CHAIN].plac)
-            spk = NO_LOCKSITE;
-        if (spk != CHAIN_LOCKED) {
-            rspeak(spk);
-            return GO_CLEAROBJ;
+
+        switch (game.prop[BEAR]) {
+        case BEAR_DEAD:
+            game.fixed[BEAR] = -1;
+            break;
+        default:
+            game.fixed[BEAR] = 0;
         }
-        game.prop[CHAIN] = CHAIN_FIXED;
-        if (TOTING(CHAIN))
-            drop(CHAIN, game.loc);
-        game.fixed[CHAIN] = -1;
+        rspeak(CHAIN_UNLOCKED);
+        return GO_CLEAROBJ;
     }
-    rspeak(spk);
+
+    if (game.prop[CHAIN] != CHAIN_HEAP) {
+        rspeak(ALREADY_LOCKED);
+        return GO_CLEAROBJ;
+    }
+    if (game.loc != objects[CHAIN].plac) {
+        rspeak(NO_LOCKSITE);
+        return GO_CLEAROBJ;
+    }
+
+    game.prop[CHAIN] = CHAIN_FIXED;
+
+    if (TOTING(CHAIN))
+        drop(CHAIN, game.loc);
+    game.fixed[CHAIN] = -1;
+
+    rspeak(CHAIN_LOCKED);
     return GO_CLEAROBJ;
 }
 
@@ -429,8 +432,8 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             rspeak(GEM_FITS);
             game.prop[obj] = 1;
             game.prop[CAVITY] = CAVITY_FULL;
-            if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) || (obj == RUBY &&
-                              game.prop[RUG] == RUG_HOVER))) {
+            if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
+                              (obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
                 spk = RUG_RISES;
                 if (TOTING(RUG))
                     spk = RUG_WIGGLES;
@@ -456,14 +459,14 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             DESTROY(BIRD);
             return GO_CLEAROBJ;
         } else if (obj == BEAR && AT(TROLL)) {
-            rspeak(TROLL_SCAMPERS);
+            state_change(TROLL, TROLL_GONE);
             move(TROLL, LOC_NOWHERE);
             move(TROLL + NOBJECTS, LOC_NOWHERE);
             move(TROLL2, objects[TROLL].plac);
             move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
             juggle(CHASM);
-            game.prop[TROLL] = TROLL_GONE;
-        } else if (obj != VASE || game.loc == objects[PILLOW].plac) {
+        } else if (obj != VASE ||
+                   game.loc == objects[PILLOW].plac) {
             rspeak(OK_MAN);
         } else {
             game.prop[VASE] = VASE_BROKEN;
@@ -494,23 +497,30 @@ static int drink(token_t verb, token_t obj)
 /*  Drink.  If no object, assume water and look for it here.  If water is in
  *  the bottle, drink that, else must be at a water loc, so drink stream. */
 {
-    if (obj == NO_OBJECT && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
+    if (obj == NO_OBJECT && LIQLOC(game.loc) != WATER &&
+        (LIQUID() != WATER || !HERE(BOTTLE))) {
         return GO_UNKNOWN;
-    if (obj != BLOOD) {
-        if (obj != NO_OBJECT && obj != WATER) {
-            rspeak(RIDICULOUS_ATTEMPT);
-        } else if (LIQUID() == WATER && HERE(BOTTLE)) {
-            game.prop[BOTTLE] = EMPTY_BOTTLE;
-            game.place[WATER] = LOC_NOWHERE;
-            rspeak(BOTTLE_EMPTY);
-        } else {
-            rspeak(actions[verb].message);
-        }
-    } else {
+    }
+
+    if (obj == BLOOD) {
         DESTROY(BLOOD);
         state_change(DRAGON, DRAGON_BLOODLESS);
         game.blooded = true;
+        return GO_CLEAROBJ;
+    }
+
+    if (obj != NO_OBJECT && obj != WATER) {
+        rspeak(RIDICULOUS_ATTEMPT);
+        return GO_CLEAROBJ;
+    }
+    if (LIQUID() == WATER && HERE(BOTTLE)) {
+        game.prop[BOTTLE] = EMPTY_BOTTLE;
+        game.place[WATER] = LOC_NOWHERE;
+        rspeak(BOTTLE_EMPTY);
+        return GO_CLEAROBJ;
     }
+
+    rspeak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -518,23 +528,31 @@ static int eat(token_t verb, token_t obj)
 /*  Eat.  Intransitive: assume food if present, else ask what.  Transitive: food
  *  ok, some things lose appetite, rest are ridiculous. */
 {
-    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (!HERE(FOOD))
             return GO_UNKNOWN;
         DESTROY(FOOD);
-        spk = THANKS_DELICIOUS;
-    } else {
-        if (obj == FOOD) {
-            DESTROY(FOOD);
-            spk = THANKS_DELICIOUS;
-        }
-        if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
-            DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
-            OGRE)
-            spk = LOST_APPETITE;
+        rspeak(THANKS_DELICIOUS);
+        return GO_CLEAROBJ;
     }
-    rspeak(spk);
+    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) {
+        rspeak(LOST_APPETITE);
+        return GO_CLEAROBJ;
+    }
+    rspeak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -546,9 +564,7 @@ static int extinguish(token_t verb, int obj)
             obj = LAMP;
         if (HERE(URN) && game.prop[URN] == URN_LIT)
             obj = URN;
-        if (obj == INTRANSITIVE ||
-            (HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT &&
-             HERE(URN) && game.prop[URN] == URN_LIT))
+        if (obj == INTRANSITIVE)
             return GO_UNKNOWN;
     }
 
@@ -558,16 +574,24 @@ static int extinguish(token_t verb, int obj)
         } else {
             pspeak(URN, change, URN_DARK, true);
         }
+        return GO_CLEAROBJ;
+    }
 
-    } else if (obj == LAMP) {
+    if (obj == LAMP) {
         state_change(LAMP, LAMP_DARK);
-        rspeak(DARK(game.loc) ? PITCH_DARK : NO_MESSAGE);
-    } else if (obj == DRAGON || obj == VOLCANO) {
-        rspeak(BEYOND_POWER);
+        rspeak(DARK(game.loc) ?
+               PITCH_DARK :
+               NO_MESSAGE);
+        return GO_CLEAROBJ;
+    }
 
-    } else {
-        rspeak(actions[verb].message);
+    if (obj == DRAGON ||
+        obj == VOLCANO) {
+        rspeak(BEYOND_POWER);
+        return GO_CLEAROBJ;
     }
+
+    rspeak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -579,7 +603,9 @@ static int feed(token_t verb, token_t obj)
     if (obj == BIRD) {
         rspeak(BIRD_PINING);
         return GO_CLEAROBJ;
-    } else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
+    } else if (obj == SNAKE ||
+               obj == DRAGON ||
+               obj == TROLL) {
         spk = NOTHING_EDIBLE;
         if (obj == DRAGON && game.prop[DRAGON] != DRAGON_BARS)
             spk = RIDICULOUS_ATTEMPT;
@@ -620,132 +646,159 @@ int fill(token_t verb, token_t obj)
 /*  Fill.  Bottle or urn must be empty, and liquid available.  (Vase
  *  is nasty.) */
 {
-    int k;
-    int spk = actions[verb].message;
     if (obj == VASE) {
-        spk = ARENT_CARRYING;
-        if (LIQLOC(game.loc) == 0)
-            spk = FILL_INVALID;
-        if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
-            rspeak(spk);
+        if (LIQLOC(game.loc) == NO_OBJECT) {
+            rspeak(FILL_INVALID);
+            return GO_CLEAROBJ;
+        }
+        if (!TOTING(VASE)) {
+            rspeak(ARENT_CARRYING);
             return GO_CLEAROBJ;
         }
         rspeak(SHATTER_VASE);
         game.prop[VASE] = VASE_BROKEN;
         game.fixed[VASE] = -1;
         return (discard(verb, obj, true));
-    } else if (obj == URN) {
-        spk = FULL_URN;
+    }
+
+    if (obj == URN) {
         if (game.prop[URN] != URN_EMPTY) {
-            rspeak(spk);
+            rspeak(FULL_URN);
             return GO_CLEAROBJ;
         }
-        spk = FILL_INVALID;
-        k = LIQUID();
-        if (k == 0 || !HERE(BOTTLE)) {
-            rspeak(spk);
+        if (!HERE(BOTTLE)) {
+            rspeak(FILL_INVALID);
             return GO_CLEAROBJ;
         }
-        game.place[k] = LOC_NOWHERE;
-        game.prop[BOTTLE] = EMPTY_BOTTLE;
-        if (k == OIL)
+        int k = LIQUID();
+        switch (k) {
+        case WATER:
+            game.prop[BOTTLE] = EMPTY_BOTTLE;
+            rspeak(WATER_URN);
+            break;
+        case OIL:
             game.prop[URN] = URN_DARK;
-        spk = WATER_URN + game.prop[URN];
-        rspeak(spk);
+            game.prop[BOTTLE] = EMPTY_BOTTLE;
+            rspeak(OIL_URN);
+            break;
+        case NO_OBJECT:
+        default:
+            rspeak(FILL_INVALID);
+            return GO_CLEAROBJ;
+        }
+        game.place[k] = LOC_NOWHERE;
         return GO_CLEAROBJ;
-    } else if (obj != NO_OBJECT && obj != BOTTLE) {
-        rspeak(spk);
+    }
+    if (obj != NO_OBJECT && obj != BOTTLE) {
+        rspeak(actions[verb].message);
         return GO_CLEAROBJ;
-    } else if (obj == NO_OBJECT && !HERE(BOTTLE))
+    }
+    if (obj == NO_OBJECT && !HERE(BOTTLE))
         return GO_UNKNOWN;
-    spk = BOTTLED_WATER;
-    if (LIQLOC(game.loc) == 0)
-        spk = NO_LIQUID;
-    if (HERE(URN) && game.prop[URN] != URN_EMPTY)
-        spk = URN_NOPOUR;
-    if (LIQUID() != 0)
-        spk = BOTTLE_FULL;
-    if (spk == BOTTLED_WATER) {
-        /* FIXME: Arithmetic on property values */
-        game.prop[BOTTLE] = MOD(conditions[game.loc], 4) / 2 * 2;
-        k = LIQUID();
-        if (TOTING(BOTTLE))
-            game.place[k] = CARRIED;
-        if (k == OIL)
-            spk = BOTTLED_OIL;
+
+    if (HERE(URN) && game.prop[URN] != URN_EMPTY) {
+        rspeak(URN_NOPOUR);
+        return GO_CLEAROBJ;
     }
-    rspeak(spk);
+    if (LIQUID() != NO_OBJECT) {
+        rspeak(BOTTLE_FULL);
+        return GO_CLEAROBJ;
+    }
+    if (LIQLOC(game.loc) == NO_OBJECT) {
+        rspeak(NO_LIQUID);
+        return GO_CLEAROBJ;
+    }
+
+    game.prop[BOTTLE] = (LIQLOC(game.loc) == OIL) ? OIL_BOTTLE : WATER_BOTTLE;
+    if (TOTING(BOTTLE))
+        game.place[LIQUID()] = CARRIED;
+    if (LIQUID() == OIL)
+        rspeak(BOTTLED_OIL);
+    else
+        rspeak(BOTTLED_WATER);
     return GO_CLEAROBJ;
 }
 
 static int find(token_t verb, token_t obj)
 /* Find.  Might be carrying it, or it might be here.  Else give caveat. */
 {
-    int spk = actions[verb].message;
+    if (TOTING(obj)) {
+        rspeak(ALREADY_CARRYING);
+        return GO_CLEAROBJ;
+    }
+
+    if (game.closed) {
+        rspeak(NEEDED_NEARBY);
+        return GO_CLEAROBJ;
+    }
+
     if (AT(obj) ||
         (LIQUID() == obj && AT(BOTTLE)) ||
         obj == LIQLOC(game.loc) ||
-        (obj == DWARF && atdwrf(game.loc) > 0))
-        spk = YOU_HAVEIT;
-    if (game.closed)
-        spk = NEEDED_NEARBY;
-    if (TOTING(obj))
-        spk = ALREADY_CARRYING;
-    rspeak(spk);
+        (obj == DWARF && atdwrf(game.loc) > 0)) {
+        rspeak(YOU_HAVEIT);
+        return GO_CLEAROBJ;
+    }
+
+
+    rspeak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
 static int fly(token_t verb, token_t obj)
 /* Fly.  Snide remarks unless hovering rug is here. */
 {
-    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
-        if (game.prop[RUG] != RUG_HOVER)
-            spk = RUG_NOTHING2;
-        if (!HERE(RUG))
-            spk = FLAP_ARMS;
-        if (spk == RUG_NOTHING2 || spk == FLAP_ARMS) {
-            rspeak(spk);
+        if (!HERE(RUG)) {
+            rspeak(FLAP_ARMS);
+            return GO_CLEAROBJ;
+        }
+        if (game.prop[RUG] != RUG_HOVER) {
+            rspeak(RUG_NOTHING2);
             return GO_CLEAROBJ;
         }
         obj = RUG;
     }
 
     if (obj != RUG) {
-        rspeak(spk);
+        rspeak(actions[verb].message);
         return GO_CLEAROBJ;
     }
-    spk = RUG_NOTHING1;
     if (game.prop[RUG] != RUG_HOVER) {
-        rspeak(spk);
+        rspeak(RUG_NOTHING1);
         return GO_CLEAROBJ;
     }
     game.oldlc2 = game.oldloc;
     game.oldloc = game.loc;
     /* FIXME: Arithmetic on location values */
     game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
-    spk = RUG_GOES;
-    if (game.prop[SAPPH] >= 0)
-        spk = RUG_RETURNS;
-    rspeak(spk);
+
+    if (game.prop[SAPPH] >= 0) {
+        rspeak(RUG_RETURNS);
+    } else {
+        rspeak(RUG_GOES);
+    }
     return GO_TERMINATE;
 }
 
 static int inven(void)
 /* Inventory. If object, treat same as find.  Else report on current burden. */
 {
-    int spk = NO_CARRY;
+    bool empty = true;
     for (int i = 1; i <= NOBJECTS; i++) {
-        if (i == BEAR || !TOTING(i))
+        if (i == BEAR ||
+            !TOTING(i))
             continue;
-        if (spk == NO_CARRY)
+        if (empty) {
             rspeak(NOW_HOLDING);
+            empty = false;
+        }
         pspeak(i, touch, -1, false);
-        spk = NO_MESSAGE;
     }
     if (TOTING(BEAR))
-        spk = TAME_BEAR;
-    rspeak(spk);
+        rspeak(TAME_BEAR);
+    if (empty)
+        rspeak(NO_CARRY);
     return GO_CLEAROBJ;
 }
 
@@ -764,7 +817,9 @@ static int light(token_t verb, token_t obj)
     }
 
     if (obj == URN) {
-        state_change(URN, game.prop[URN] == URN_EMPTY ? URN_EMPTY : URN_LIT);
+        state_change(URN, game.prop[URN] == URN_EMPTY ?
+                     URN_EMPTY :
+                     URN_LIT);
         return GO_CLEAROBJ;
     } else {
         if (obj != LAMP) {
@@ -786,39 +841,37 @@ static int light(token_t verb, token_t obj)
 static int listen(void)
 /*  Listen.  Intransitive only.  Print stuff based on objsnd/locsnd. */
 {
-    long k;
-    int spk = ALL_SILENT;
-    k = locations[game.loc].sound;
-    if (k != SILENT) {
-        rspeak(k);
-        if (locations[game.loc].loud)
-            return GO_CLEAROBJ;
-        else
-            spk = NO_MESSAGE;
+    long sound = locations[game.loc].sound;
+    if (sound != SILENT) {
+        rspeak(sound);
+        if (!locations[game.loc].loud)
+            rspeak(NO_MESSAGE);
+        return GO_CLEAROBJ;
     }
     for (int i = 1; i <= NOBJECTS; i++) {
-        if (!HERE(i) || objects[i].sounds[0] == NULL || game.prop[i] < 0)
+        if (!HERE(i) ||
+            objects[i].sounds[0] == NULL ||
+            game.prop[i] < 0)
             continue;
         int mi =  game.prop[i];
         if (i == BIRD)
             mi += 3 * game.blooded;
         long packed_zzword = token_to_packed(game.zzword);
         pspeak(i, hear, mi, true, packed_zzword);
-        spk = NO_MESSAGE;
+        rspeak(NO_MESSAGE);
         /* FIXME: Magic number, sensitive to bird state logic */
         if (i == BIRD && game.prop[i] == 5)
             DESTROY(BIRD);
+        return GO_CLEAROBJ;
     }
-    rspeak(spk);
+    rspeak(ALL_SILENT);
     return GO_CLEAROBJ;
 }
 
 static int lock(token_t verb, token_t obj)
 /* Lock, unlock, no object given.  Assume various things if present. */
 {
-    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
-        spk = NOTHING_LOCKED;
         if (HERE(CLAM))
             obj = CLAM;
         if (HERE(OYSTER))
@@ -829,41 +882,69 @@ static int lock(token_t verb, token_t obj)
             obj = GRATE;
         if (HERE(CHAIN))
             obj = CHAIN;
-        if (obj == NO_OBJECT || obj == INTRANSITIVE) {
-            rspeak(spk);
+        if (obj == INTRANSITIVE) {
+            rspeak(NOTHING_LOCKED);
             return GO_CLEAROBJ;
         }
     }
 
     /*  Lock, unlock object.  Special stuff for opening clam/oyster
      *  and for chain. */
-    if (obj == CLAM || obj == OYSTER)
-        return bivalve(verb, obj);
-    if (obj == DOOR)
-        spk = RUSTY_DOOR;
-    if (obj == DOOR && game.prop[DOOR] == DOOR_UNRUSTED)
-        spk = OK_MAN;
-    if (obj == CAGE)
-        spk = NO_LOCK;
-    if (obj == KEYS)
-        spk = CANNOT_UNLOCK;
-    if (obj == GRATE || obj == CHAIN) {
-        spk = NO_KEYS;
+    if (obj == GRATE ||
+        obj == CHAIN) {
         if (HERE(KEYS)) {
             if (obj == CHAIN)
                 return chain(verb);
             if (game.closng) {
-                spk = EXIT_CLOSED;
+                rspeak(EXIT_CLOSED);
                 if (!game.panic)
                     game.clock2 = PANICTIME;
                 game.panic = true;
+                return GO_CLEAROBJ ;
             } else {
-                state_change(GRATE, (verb == LOCK) ? GRATE_CLOSED : GRATE_OPEN);
+                state_change(GRATE, (verb == LOCK) ?
+                             GRATE_CLOSED :
+                             GRATE_OPEN);
                 return GO_CLEAROBJ;
             }
         }
+        rspeak(NO_KEYS);
+        return GO_CLEAROBJ;
     }
-    rspeak(spk);
+
+    switch (obj) {
+    case CLAM:
+        if (verb == LOCK)
+            rspeak(HUH_MAN);
+        else if (!TOTING(TRIDENT))
+            rspeak(OYSTER_OPENER);
+        else {
+            DESTROY(CLAM);
+            drop(OYSTER, game.loc);
+            drop(PEARL, LOC_CULDESAC);
+            rspeak(PEARL_FALLS);
+        }
+        return GO_CLEAROBJ;
+    case OYSTER:
+        if (verb == LOCK)
+            rspeak(HUH_MAN);
+        else
+            rspeak(OYSTER_OPENER);
+
+        return GO_CLEAROBJ;
+    case DOOR:
+        rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);
+        break;
+    case CAGE:
+        rspeak( NO_LOCK);
+        break;
+    case KEYS:
+        rspeak(CANNOT_UNLOCK);
+        break;
+    default:
+        rspeak(actions[verb].message);
+    }
+
     return GO_CLEAROBJ;
 }
 
@@ -871,41 +952,43 @@ 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)
+    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);
+    if (!(AT(PLANT) ||
+          AT(DOOR))) {
+        rspeak(GROUND_WET);
         return GO_CLEAROBJ;
     }
     if (!AT(DOOR)) {
-        spk = SHAKING_LEAVES;
-        if (obj != WATER) {
-            rspeak(spk);
+        if (obj == WATER) {
+	    /* cycle through the three plant states */
+	    state_change(PLANT, MOD(game.prop[PLANT] + 1, 3));
+	    game.prop[PLANT2] = game.prop[PLANT];
+	    return GO_MOVE;
+        } else {
+            rspeak(SHAKING_LEAVES);
             return GO_CLEAROBJ;
-        }
-        pspeak(PLANT, look, game.prop[PLANT] + 3, true);
-        game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
-        game.prop[PLANT2] = game.prop[PLANT];
-        return GO_MOVE;
+	}
     } else {
-        state_change(DOOR, (obj == OIL) ? DOOR_UNRUSTED : DOOR_RUSTED);
+        state_change(DOOR, (obj == OIL) ?
+                     DOOR_UNRUSTED :
+                     DOOR_RUSTED);
         return GO_CLEAROBJ;
     }
 }
@@ -927,15 +1010,18 @@ static int read(struct command_t command)
             if (HERE(i) && objects[i].texts[0] != NULL && game.prop[i] >= 0)
                 command.obj = command.obj * NOBJECTS + i;
         }
-        if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
+        if (command.obj > NOBJECTS ||
+            command.obj == 0 ||
+            DARK(game.loc))
             return GO_UNKNOWN;
     }
 
     if (DARK(game.loc)) {
-        rspeak(NO_SEE, command.wd1, command.wd1x);
+        sspeak(NO_SEE, command.raw1);
     } else if (command.obj == OYSTER && !game.clshnt && game.closed) {
         game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
-    } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
+    } else if (objects[command.obj].texts[0] == NULL ||
+               game.prop[command.obj] < 0) {
         rspeak(actions[command.verb].message);
     } else
         pspeak(command.obj, study, game.prop[command.obj], true);
@@ -945,17 +1031,18 @@ static int read(struct command_t command)
 static int reservoir(void)
 /*  Z'ZZZ (word gets recomputed at startup; different each game). */
 {
+    /* FIXME: Arithmetic on state numbers */
     if (!AT(RESER) && game.loc != game.fixed[RESER] - 1) {
         rspeak(NOTHING_HAPPENS);
         return GO_CLEAROBJ;
     } else {
-        pspeak(RESER, look, game.prop[RESER] + 1, true);
-        game.prop[RESER] = 1 - game.prop[RESER];
+	state_change(RESER,
+		     game.prop[RESER] == WATERS_PARTED ? WATERS_UNPARTED : WATERS_PARTED);
         if (AT(RESER))
             return GO_CLEAROBJ;
         else {
             game.oldlc2 = game.loc;
-            game.newloc = 0;
+            game.newloc = LOC_NOWHERE;
             rspeak(NOT_BRIGHT);
             return GO_TERMINATE;
         }
@@ -983,22 +1070,24 @@ static int rub(token_t verb, token_t obj)
 static int say(struct command_t *command)
 /* Say.  Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).)  Magic words override. */
 {
-    long a = command->wd1, b = command->wd1x;
     if (command->wd2 > 0) {
-        a = command->wd2;
-        b = command->wd2x;
         command->wd1 = command->wd2;
+        strcpy(command->raw1, command->raw2);
     }
-    char word1[6];
+    char word1[TOKLEN + 1];
     packed_to_token(command->wd1, word1);
     int wd = (int) get_vocab_id(word1);
     /* FIXME: magic numbers */
-    if (wd == MOTION_WORD(XYZZY) || wd == MOTION_WORD(PLUGH) || wd == MOTION_WORD(PLOVER) || wd == ACTION_WORD(GIANTWORDS) || wd == ACTION_WORD(PART)) {
+    if (wd == MOTION_WORD(XYZZY) ||
+        wd == MOTION_WORD(PLUGH) ||
+        wd == MOTION_WORD(PLOVER) ||
+        wd == ACTION_WORD(GIANTWORDS) ||
+        wd == ACTION_WORD(PART)) {
         /* FIXME: scribbles on the interpreter's command block */
         wordclear(&command->wd2);
         return GO_LOOKUP;
     }
-    rspeak(OKEY_DOKEY, a, b);
+    sspeak(OKEY_DOKEY, command->raw1);
     return GO_CLEAROBJ;
 }
 
@@ -1064,9 +1153,10 @@ static int throw (struct command_t *command)
         } else {
             long i = atdwrf(game.loc);
             game.dseen[i] = false;
-            game.dloc[i] = 0;
-            return throw_support((++game.dkill == 1)
-                                 ? DWARF_SMOKE : KILLED_DWARF);
+            game.dloc[i] = LOC_NOWHERE;
+            return throw_support((++game.dkill == 1) ?
+                                 DWARF_SMOKE :
+                                 KILLED_DWARF);
         }
     }
 }
@@ -1074,7 +1164,8 @@ static int throw (struct command_t *command)
 static int wake(token_t verb, token_t obj)
 /* Wake.  Only use is to disturb the dwarves. */
 {
-    if (obj != DWARF || !game.closed) {
+    if (obj != DWARF ||
+        !game.closed) {
         rspeak(actions[verb].message);
         return GO_CLEAROBJ;
     } else {
@@ -1083,23 +1174,18 @@ 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. */
 {
     if (obj != ROD ||
         !TOTING(obj) ||
-        (!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
-        rspeak(((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2))) ? ARENT_CARRYING : actions[verb].message);
+        (!HERE(BIRD) &&
+         (game.closng ||
+          !AT(FISSURE)))) {
+        rspeak(((!TOTING(obj)) && (obj != ROD ||
+                                   !TOTING(ROD2))) ?
+               ARENT_CARRYING :
+               actions[verb].message);
         return GO_CLEAROBJ;
     }
 
@@ -1111,19 +1197,25 @@ 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());
+        if (game.closng ||
+            !AT(FISSURE)) {
+            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];
-        pspeak(FISSURE, look, 2 - game.prop[FISSURE], true);
+        state_change(FISSURE,
+	    game.prop[FISSURE] == BRIDGED ? UNBRIDGED : BRIDGED);
         return GO_CLEAROBJ;
     }
 }
@@ -1144,14 +1236,22 @@ int action(struct command_t *command)
         if (HERE(command->obj))
             /* FALL THROUGH */;
         else if (command->obj == GRATE) {
-            if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
+            if (game.loc == LOC_START ||
+                game.loc == LOC_VALLEY ||
+                game.loc == LOC_SLIT) {
                 command->obj = DPRSSN;
-            if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
-                game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
+            }
+            if (game.loc == LOC_COBBLE ||
+                game.loc == LOC_DEBRIS ||
+                game.loc == LOC_AWKWARD ||
+                game.loc == LOC_BIRD ||
+                game.loc == LOC_PITTOP) {
                 command->obj = ENTRNC;
+            }
         } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
             /* FALL THROUGH */;
-        else if ((LIQUID() == command->obj && HERE(BOTTLE)) || command->obj == LIQLOC(game.loc))
+        else if ((LIQUID() == command->obj && HERE(BOTTLE)) ||
+                 command->obj == LIQLOC(game.loc))
             /* FALL THROUGH */;
         else if (command->obj == OIL && HERE(URN) && game.prop[URN] != 0) {
             command->obj = URN;
@@ -1166,10 +1266,11 @@ int action(struct command_t *command)
         } else if (command->obj == ROD && HERE(ROD2)) {
             command->obj = ROD2;
             /* FALL THROUGH */;
-        } else if ((command->verb == FIND || command->verb == INVENTORY) && command->wd2 <= 0)
+        } else if ((command->verb == FIND ||
+                    command->verb == INVENTORY) && command->wd2 <= 0)
             /* FALL THROUGH */;
         else {
-            rspeak(NO_SEE, command->wd1, command->wd1x);
+            sspeak(NO_SEE, command->raw1);
             return GO_CLEAROBJ;
         }
 
@@ -1185,7 +1286,8 @@ int action(struct command_t *command)
             return GO_WORD2;
         if (command->verb == SAY)
             command->obj = command->wd2;
-        if (command->obj == 0 || command->obj == INTRANSITIVE) {
+        if (command->obj == 0 ||
+            command->obj == INTRANSITIVE) {
             /*  Analyse an intransitive verb (ie, no object given yet). */
             switch (command->verb) {
             case CARRY:
@@ -1365,7 +1467,7 @@ int action(struct command_t *command)
         }
     case unknown:
         /* Unknown verb, couldn't deduce object - might need hint */
-        rspeak(WHAT_DO, command->wd1, command->wd1x);
+        sspeak(WHAT_DO, command->raw1);
         return GO_CHECKHINT;
     default:
         BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE