X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=5bb95553bc21937c348c5088ef32e143dca58558;hp=87301f72141a9aebd23360f9defe464163419d8f;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=237f1a876feb173ae4b52dd037138c9b0b2a42c4

diff --git a/actions.c b/actions.c
index 87301f7..5bb9555 100644
--- a/actions.c
+++ b/actions.c
@@ -14,9 +14,9 @@ static int attack(FILE *input, struct command_t *command)
 {
     vocab_t verb = command->verb;
     vocab_t obj = command->obj;
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == 0 || obj == INTRANSITIVE) {
-        if (ATDWRF(game.loc) > 0)
+        if (atdwrf(game.loc) > 0)
             obj = DWARF;
         if (HERE(SNAKE))obj = obj * NOBJECTS + SNAKE;
         if (AT(DRAGON) && game.prop[DRAGON] == 0)obj = obj * NOBJECTS + DRAGON;
@@ -38,15 +38,15 @@ static int attack(FILE *input, struct command_t *command)
     if (obj == BIRD) {
         spk = UNHAPPY_BIRD;
         if (game.closed) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         DESTROY(BIRD);
-        game.prop[BIRD] = 0;
         spk = BIRD_DEAD;
     } else if (obj == VEND) {
-        PSPEAK(VEND, game.prop[VEND] + 2);
-        game.prop[VEND] = 3 - game.prop[VEND];
+	bool blocking = (game.prop[VEND] == VEND_BLOCKS);
+        game.prop[VEND] = blocking ? VEND_UNBLOCKS : VEND_BLOCKS;
+        rspeak(blocking ? MACHINE_SWINGOUT : MACHINE_SWINGBACK);
         return GO_CLEAROBJ;
     }
 
@@ -58,9 +58,9 @@ static int attack(FILE *input, struct command_t *command)
     if (obj == DRAGON)spk = ALREADY_DEAD;
     if (obj == TROLL)spk = ROCKY_TROLL;
     if (obj == OGRE)spk = OGRE_DODGE;
-    if (obj == OGRE && ATDWRF(game.loc) > 0) {
-        RSPEAK(spk);
-        RSPEAK(KNIFE_THROWN);
+    if (obj == OGRE && atdwrf(game.loc) > 0) {
+        rspeak(spk);
+        rspeak(KNIFE_THROWN);
         DESTROY(OGRE);
         int dwarves = 0;
         for (int i = 1; i < PIRATE; i++) {
@@ -79,28 +79,28 @@ static int attack(FILE *input, struct command_t *command)
          *  Set game.prop to dead, move dragon to central loc (still
          *  fixed), move rug there (not fixed), and move him there,
          *  too.  Then do a null motion to get new description. */
-        RSPEAK(BARE_HANDS_QUERY);
+        rspeak(BARE_HANDS_QUERY);
         GETIN(input, &command->wd1, &command->wd1x, &command->wd2, &command->wd2x);
         if (command->wd1 != MAKEWD(WORD_YINIT) && command->wd1 != MAKEWD(WORD_YES))
             return GO_CHECKFOO;
-        PSPEAK(DRAGON, 3);
+        pspeak(DRAGON, look, 3);
         game.prop[DRAGON] = 1;
         game.prop[RUG] = 0;
-        int k = (PLAC[DRAGON] + FIXD[DRAGON]) / 2;
-        MOVE(DRAGON + NOBJECTS, -1);
-        MOVE(RUG + NOBJECTS, 0);
-        MOVE(DRAGON, k);
-        MOVE(RUG, k);
-        DROP(BLOOD, k);
+        int k = (objects[DRAGON].plac + objects[DRAGON].fixd) / 2;
+        move(DRAGON + NOBJECTS, -1);
+        move(RUG + NOBJECTS, 0);
+        move(DRAGON, k);
+        move(RUG, k);
+        drop(BLOOD, k);
         for (obj = 1; obj <= NOBJECTS; obj++) {
-            if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
-                MOVE(obj, k);
+            if (game.place[obj] == objects[DRAGON].plac || game.place[obj] == objects[DRAGON].fixd)
+                move(obj, k);
         }
         game.loc = k;
         return GO_MOVE;
     }
 
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -109,21 +109,21 @@ static int bigwords(token_t foo)
  *  Look up foo in section 3 of vocab to determine which word we've got.  Last
  *  word zips the eggs back to the giant room (unless already there). */
 {
-    int k = VOCAB(foo, 3);
+    int k = vocab(foo, 3);
     int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
-        if (game.foobar != 0)spk = START_OVER;
-        RSPEAK(spk);
+        if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
+        rspeak(spk);
         return GO_CLEAROBJ;
     } else {
         game.foobar = k;
         if (k != 4) {
-            RSPEAK(OK_MAN);
+            rspeak(OK_MAN);
             return GO_CLEAROBJ;
         }
         game.foobar = 0;
-        if (game.place[EGGS] == PLAC[EGGS] || (TOTING(EGGS) && game.loc == PLAC[EGGS])) {
-            RSPEAK(spk);
+        if (game.place[EGGS] == objects[EGGS].plac || (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
+            rspeak(spk);
             return GO_CLEAROBJ;
         } else {
             /*  Bring back troll if we steal the eggs back from him before
@@ -132,9 +132,9 @@ static int bigwords(token_t foo)
                 game.prop[TROLL] = 1;
             k = 2;
             if (HERE(EGGS))k = 1;
-            if (game.loc == PLAC[EGGS])k = 0;
-            MOVE(EGGS, PLAC[EGGS]);
-            PSPEAK(EGGS, k);
+            if (game.loc == objects[EGGS].plac)k = 0;
+            move(EGGS, objects[EGGS].plac);
+            pspeak(EGGS, look, k);
             return GO_CLEAROBJ;
         }
     }
@@ -151,10 +151,10 @@ static int bivalve(token_t verb, token_t obj)
     if (verb == LOCK)spk = HUH_MAN;
     if (spk == PEARL_FALLS) {
         DESTROY(CLAM);
-        DROP(OYSTER, game.loc);
-        DROP(PEARL, LOC_CULDESAC);
+        drop(OYSTER, game.loc);
+        drop(PEARL, LOC_CULDESAC);
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -162,14 +162,14 @@ static void blast(void)
 /*  Blast.  No effect unless you've got dynamite, which is a neat trick! */
 {
     if (game.prop[ROD2] < 0 || !game.closed)
-        RSPEAK(REQUIRES_DYNAMITE);
+        rspeak(REQUIRES_DYNAMITE);
     else {
         game.bonus = VICTORY_MESSAGE;
         if (game.loc == LOC_NE)
             game.bonus = DEFEAT_MESSAGE;
         if (HERE(ROD2))
             game.bonus = SPLATTER_MESSAGE;
-        RSPEAK(game.bonus);
+        rspeak(game.bonus);
         terminate(endgame);
     }
 }
@@ -177,20 +177,20 @@ static void blast(void)
 static int vbreak(token_t verb, token_t obj)
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == MIRROR)spk = TOO_FAR;
     if (obj == VASE && game.prop[VASE] == 0) {
-        if (TOTING(VASE))DROP(VASE, game.loc);
+        if (TOTING(VASE))drop(VASE, game.loc);
         game.prop[VASE] = 2;
         game.fixed[VASE] = -1;
         spk = BREAK_VASE;
     } else {
         if (obj == MIRROR && game.closed) {
-            RSPEAK(BREAK_MIRROR);
+            rspeak(BREAK_MIRROR);
             return GO_DWARFWAKE;
         }
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -199,11 +199,11 @@ static int brief(void)
 {
     game.abbnum = 10000;
     game.detail = 3;
-    RSPEAK(BRIEF_CONFIRM);
+    rspeak(BRIEF_CONFIRM);
     return GO_CLEAROBJ;
 }
 
-static int carry(token_t verb, token_t obj)
+static int vcarry(token_t verb, token_t obj)
 /*  Carry an object.  Special cases for bird and cage (if bird in cage, can't
  *  take one without the other).  Liquids also special, since they depend on
  *  status of bottle.  Also various side effects, etc. */
@@ -213,13 +213,13 @@ static int carry(token_t verb, token_t obj)
         /*  Carry, no object given yet.  OK if only one object present. */
         if (game.atloc[game.loc] == 0 ||
             game.link[game.atloc[game.loc]] != 0 ||
-            ATDWRF(game.loc) > 0)
+            atdwrf(game.loc) > 0)
             return GO_UNKNOWN;
         obj = game.atloc[game.loc];
     }
 
     if (TOTING(obj)) {
-        RSPEAK(ALREADY_CARRYING);
+        rspeak(ALREADY_CARRYING);
         return GO_CLEAROBJ;
     }
     spk = YOU_JOKING;
@@ -232,22 +232,23 @@ static int carry(token_t verb, token_t obj)
     if (obj == RUG && game.prop[RUG] == 2)spk = RUG_HOVERS;
     if (obj == SIGN)spk = HAND_PASSTHROUGH;
     if (obj == MESSAG) {
-        RSPEAK(REMOVE_MESSAGE);
+        rspeak(REMOVE_MESSAGE);
         DESTROY(MESSAG);
         return GO_CLEAROBJ;
     }
     if (game.fixed[obj] != 0) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     if (obj == WATER || obj == OIL) {
         if (!HERE(BOTTLE) || LIQUID() != obj) {
-            if (TOTING(BOTTLE) && game.prop[BOTTLE] == 1)
+            if (TOTING(BOTTLE) && game.prop[BOTTLE] == EMPTY_BOTTLE)
                 return (fill(verb, BOTTLE));
             else {
-                if (game.prop[BOTTLE] != 1)spk = BOTTLE_FULL;
+                if (game.prop[BOTTLE] != EMPTY_BOTTLE)
+		    spk = BOTTLE_FULL;
                 if (!TOTING(BOTTLE))spk = NO_CONTAINER;
-                RSPEAK(spk);
+                rspeak(spk);
                 return GO_CLEAROBJ;
             }
         }
@@ -256,32 +257,32 @@ static int carry(token_t verb, token_t obj)
 
     spk = CARRY_LIMIT;
     if (game.holdng >= INVLIMIT) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
-    } else if (obj == BIRD && game.prop[BIRD] != 1 && -1 - game.prop[BIRD] != 1) {
-        if (game.prop[BIRD] == 2) {
+    } else 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);
+            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);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[BIRD] = 1;
+        game.prop[BIRD] = BIRD_CAGED;
     }
-    if ((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == 1 || -1 - game.prop[BIRD] == 1))
-        CARRY(BIRD + CAGE - obj, game.loc);
-    CARRY(obj, game.loc);
+    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)
         game.place[LIQUID()] = CARRIED;
     if (GSTONE(obj) && game.prop[obj] != 0) {
         game.prop[obj] = 0;
         game.prop[CAVITY] = 1;
     }
-    RSPEAK(OK_MAN);
+    rspeak(OK_MAN);
     return GO_CLEAROBJ;
 }
 
@@ -294,7 +295,7 @@ static int chain(token_t verb)
         if (game.prop[BEAR] == 0)spk = BEAR_BLOCKS;
         if (game.prop[CHAIN] == 0)spk = ALREADY_UNLOCKED;
         if (spk != CHAIN_UNLOCKED) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.prop[CHAIN] = 0;
@@ -304,16 +305,16 @@ static int chain(token_t verb)
     } else {
         spk = CHAIN_LOCKED;
         if (game.prop[CHAIN] != 0)spk = ALREADY_LOCKED;
-        if (game.loc != PLAC[CHAIN])spk = NO_LOCKSITE;
+        if (game.loc != objects[CHAIN].plac)spk = NO_LOCKSITE;
         if (spk != CHAIN_LOCKED) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.prop[CHAIN] = 2;
-        if (TOTING(CHAIN))DROP(CHAIN, game.loc);
+        if (TOTING(CHAIN))drop(CHAIN, game.loc);
         game.fixed[CHAIN] = -1;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -322,22 +323,22 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
  *  bird (might attack snake or dragon) and cage (might contain bird) and vase.
  *  Drop coins at vending machine for extra batteries. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (!just_do_it) {
         if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj = ROD2;
         if (!TOTING(obj)) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         if (obj == BIRD && HERE(SNAKE)) {
-            RSPEAK(BIRD_ATTACKS);
+            rspeak(BIRD_ATTACKS);
             if (game.closed) return GO_DWARFWAKE;
             DESTROY(SNAKE);
             /* Set game.prop for use by travel options */
             game.prop[SNAKE] = 1;
 
         } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
-            RSPEAK(GEM_FITS);
+            rspeak(GEM_FITS);
             game.prop[obj] = 1;
             game.prop[CAVITY] = 0;
             if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
@@ -345,38 +346,37 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
                 spk = RUG_RISES;
                 if (TOTING(RUG))spk = RUG_WIGGLES;
                 if (obj == RUBY)spk = RUG_SETTLES;
-                RSPEAK(spk);
+                rspeak(spk);
                 if (spk != RUG_WIGGLES) {
                     int k = 2 - game.prop[RUG];
                     game.prop[RUG] = k;
-                    if (k == 2) k = PLAC[SAPPH];
-                    MOVE(RUG + NOBJECTS, k);
+                    if (k == 2) k = objects[SAPPH].plac;
+                    move(RUG + NOBJECTS, k);
                 }
             }
         } else if (obj == COINS && HERE(VEND)) {
             DESTROY(COINS);
-            DROP(BATTERY, game.loc);
-            PSPEAK(BATTERY, 0);
+            drop(BATTERY, game.loc);
+            pspeak(BATTERY, look, FRESH_BATTERIES);
             return GO_CLEAROBJ;
         } else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
-            RSPEAK(BIRD_BURNT);
+            rspeak(BIRD_BURNT);
             DESTROY(BIRD);
-            game.prop[BIRD] = 0;
             return GO_CLEAROBJ;
         } else if (obj == BEAR && AT(TROLL)) {
-            RSPEAK(TROLL_SCAMPERS);
-            MOVE(TROLL, 0);
-            MOVE(TROLL + NOBJECTS, 0);
-            MOVE(TROLL2, PLAC[TROLL]);
-            MOVE(TROLL2 + NOBJECTS, FIXD[TROLL]);
-            JUGGLE(CHASM);
+            rspeak(TROLL_SCAMPERS);
+            move(TROLL, 0);
+            move(TROLL + NOBJECTS, 0);
+            move(TROLL2, objects[TROLL].plac);
+            move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
+            juggle(CHASM);
             game.prop[TROLL] = 2;
-        } else if (obj != VASE || game.loc == PLAC[PILLOW]) {
-            RSPEAK(OK_MAN);
+        } else if (obj != VASE || game.loc == objects[PILLOW].plac) {
+            rspeak(OK_MAN);
         } else {
             game.prop[VASE] = 2;
             if (AT(PILLOW))game.prop[VASE] = 0;
-            PSPEAK(VASE, game.prop[VASE] + 1);
+            pspeak(VASE, look, game.prop[VASE] + 1);
             if (game.prop[VASE] != 0)game.fixed[VASE] = -1;
         }
     }
@@ -384,11 +384,13 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
     if (k == obj)obj = BOTTLE;
     if (obj == BOTTLE && k != 0)
         game.place[k] = LOC_NOWHERE;
-    if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD, game.loc);
-    DROP(obj, game.loc);
+    if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
+	drop(BIRD, game.loc);
+    drop(obj, game.loc);
     if (obj != BIRD) return GO_CLEAROBJ;
-    game.prop[BIRD] = 0;
-    if (FOREST(game.loc))game.prop[BIRD] = 2;
+    game.prop[BIRD] = BIRD_UNCAGED;
+    if (FOREST(game.loc))
+	game.prop[BIRD] = BIRD_FOREST_UNCAGED;
     return GO_CLEAROBJ;
 }
 
@@ -396,23 +398,23 @@ 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. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == 0 && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
         return GO_UNKNOWN;
     if (obj != BLOOD) {
         if (obj != 0 && obj != WATER)spk = RIDICULOUS_ATTEMPT;
         if (spk != RIDICULOUS_ATTEMPT && LIQUID() == WATER && HERE(BOTTLE)) {
-            game.prop[BOTTLE] = 1;
+            game.prop[BOTTLE] = EMPTY_BOTTLE;
             game.place[WATER] = LOC_NOWHERE;
             spk = BOTTLE_EMPTY;
         }
     } else {
         DESTROY(BLOOD);
         game.prop[DRAGON] = 2;
-        OBJSND[BIRD] = OBJSND[BIRD] + 3;
+        game.blooded = true;
         spk = HEAD_BUZZES;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -420,7 +422,7 @@ 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 = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (!HERE(FOOD))
             return GO_UNKNOWN;
@@ -435,16 +437,17 @@ static int eat(token_t verb, token_t obj)
             DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
             OGRE)spk = LOST_APPETITE;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
 static int extinguish(token_t verb, int obj)
 /* Extinguish.  Lamp, urn, dragon/volcano (nice try). */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
-        if (HERE(LAMP) && game.prop[LAMP] == 1)obj = LAMP;
+        if (HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT)
+	    obj = LAMP;
         if (HERE(URN) && game.prop[URN] == 2)obj = obj * NOBJECTS + URN;
         if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return GO_UNKNOWN;
     }
@@ -453,12 +456,12 @@ static int extinguish(token_t verb, int obj)
         game.prop[URN] = game.prop[URN] / 2;
         spk = URN_DARK;
     } else if (obj == LAMP) {
-        game.prop[LAMP] = 0;
-        RSPEAK(LAMP_OFF);
+        game.prop[LAMP] = LAMP_DARK;
+        rspeak(LAMP_OFF);
         spk = DARK(game.loc) ? PITCH_DARK : NO_MESSAGE;
     } else if (obj == DRAGON || obj == VOLCANO)
         spk = BEYOND_POWER;
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -466,9 +469,9 @@ static int feed(token_t verb, token_t obj)
 /*  Feed.  If bird, no seed.  Snake, dragon, troll: quip.  If dwarf, make him
  *  mad.  Bear, special. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == BIRD) {
-        RSPEAK(BIRD_PINING);
+        rspeak(BIRD_PINING);
         return GO_CLEAROBJ;
     } else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
         spk = NOTHING_EDIBLE;
@@ -476,7 +479,6 @@ static int feed(token_t verb, token_t obj)
         if (obj == TROLL)spk = TROLL_VICES;
         if (obj == SNAKE && !game.closed && HERE(BIRD)) {
             DESTROY(BIRD);
-            game.prop[BIRD] = 0;
             spk = BIRD_DEVOURED;
         }
     } else if (obj == DWARF) {
@@ -500,7 +502,7 @@ static int feed(token_t verb, token_t obj)
     } else {
         spk = AM_GAME;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -509,38 +511,38 @@ int fill(token_t verb, token_t obj)
  *  is nasty.) */
 {
     int k;
-    int spk = ACTSPK[verb];
+    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);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
-        RSPEAK(SHATTER_VASE);
+        rspeak(SHATTER_VASE);
         game.prop[VASE] = 2;
         game.fixed[VASE] = -1;
         return (discard(verb, obj, true));
     } else if (obj == URN) {
         spk = FULL_URN;
         if (game.prop[URN] != 0) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         spk = FILL_INVALID;
         k = LIQUID();
         if (k == 0 || !HERE(BOTTLE)) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.place[k] = LOC_NOWHERE;
-        game.prop[BOTTLE] = 1;
+        game.prop[BOTTLE] = EMPTY_BOTTLE;
         if (k == OIL)game.prop[URN] = 1;
         spk = WATER_URN + game.prop[URN];
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     } else if (obj != 0 && obj != BOTTLE) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     } else if (obj == 0 && !HERE(BOTTLE))
         return GO_UNKNOWN;
@@ -552,53 +554,54 @@ int fill(token_t verb, token_t obj)
     if (LIQUID() != 0)
         spk = BOTTLE_FULL;
     if (spk == BOTTLED_WATER) {
-        game.prop[BOTTLE] = MOD(COND[game.loc], 4) / 2 * 2;
+	/* 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;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     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 = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (AT(obj) ||
         (LIQUID() == obj && AT(BOTTLE)) ||
         obj == LIQLOC(game.loc) ||
-        (obj == DWARF && ATDWRF(game.loc) > 0))
+        (obj == DWARF && atdwrf(game.loc) > 0))
         spk = YOU_HAVEIT;
     if (game.closed)spk = NEEDED_NEARBY;
     if (TOTING(obj))spk = ALREADY_CARRYING;
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
 static int fly(token_t verb, token_t obj)
 /* Fly.  Snide remarks unless hovering rug is here. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (game.prop[RUG] != 2)spk = RUG_NOTHING2;
         if (!HERE(RUG))spk = FLAP_ARMS;
         if (spk == RUG_NOTHING2 || spk == FLAP_ARMS) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         obj = RUG;
     }
 
     if (obj != RUG) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     spk = RUG_NOTHING1;
     if (game.prop[RUG] != 2) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     game.oldlc2 = game.oldloc;
@@ -607,7 +610,7 @@ static int fly(token_t verb, token_t obj)
     spk = RUG_GOES;
     if (game.prop[SAPPH] >= 0)
         spk = RUG_RETURNS;
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_TERMINATE;
 }
 
@@ -619,48 +622,49 @@ static int inven(void)
         if (i == BEAR || !TOTING(i))
             continue;
         if (spk == NO_CARRY)
-            RSPEAK(NOW_HOLDING);
+            rspeak(NOW_HOLDING);
         game.blklin = false;
-        PSPEAK(i, -1);
+        pspeak(i, touch, -1);
         game.blklin = true;
         spk = NO_MESSAGE;
     }
     if (TOTING(BEAR))
         spk = TAME_BEAR;
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
 static int light(token_t verb, token_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
-        if (HERE(LAMP) && game.prop[LAMP] == 0 && game.limit >= 0)obj = LAMP;
+        if (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0)
+	    obj = LAMP;
         if (HERE(URN) && game.prop[URN] == 1)obj = obj * NOBJECTS + URN;
         if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return GO_UNKNOWN;
     }
 
     if (obj == URN) {
         if (game.prop[URN] == 0) {
-            RSPEAK(URN_EMPTY);
+            rspeak(URN_EMPTY);
         } else {
             game.prop[URN] = 2;
-            RSPEAK(URN_LIT);
+            rspeak(URN_LIT);
         }
         return GO_CLEAROBJ;
     } else {
         if (obj != LAMP) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         spk = LAMP_OUT;
         if (game.limit < 0) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[LAMP] = 1;
-        RSPEAK(LAMP_ON);
+        game.prop[LAMP] = LAMP_BRIGHT;
+        rspeak(LAMP_ON);
         if (game.wzdark)
             return GO_TOP;
         else
@@ -671,31 +675,36 @@ static int light(token_t verb, token_t obj)
 static int listen(void)
 /*  Listen.  Intransitive only.  Print stuff based on objsnd/locsnd. */
 {
-    int k;
+    long k;
     int spk = ALL_SILENT;
-    k = LOCSND[game.loc];
-    if (k != 0) {
-        RSPEAK(labs(k));
-        if (k < 0) return GO_CLEAROBJ;
-        spk = NO_MESSAGE;
+    k = locations[game.loc].sound;
+    if (k != SILENT) {
+        rspeak(k);
+        if (locations[game.loc].loud)
+	    return GO_CLEAROBJ;
+	else
+	    spk = NO_MESSAGE;
     }
-    SETPRM(1, game.zzword, 0);
     for (int i = 1; i <= NOBJECTS; i++) {
-        if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
+        if (!HERE(i) || objects[i].sounds[0] == NULL || game.prop[i] < 0)
             continue;
-        PSPEAK(i, OBJSND[i] + game.prop[i]);
+	int mi =  game.prop[i];
+	if (i == BIRD)
+	    mi += 3 * game.blooded;
+        pspeak(i, hear, mi, game.zzword);
         spk = NO_MESSAGE;
-        if (i == BIRD && OBJSND[i] + game.prop[i] == 8)
+	/* FIXME: Magic number, sensitive to bird state logic */
+	if (i == BIRD && game.prop[i] == 5)
             DESTROY(BIRD);
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
 static int lock(token_t verb, token_t obj)
 /* Lock, unlock, no object given.  Assume various things if present. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         spk = NOTHING_LOCKED;
         if (HERE(CLAM))obj = CLAM;
@@ -705,7 +714,7 @@ static int lock(token_t verb, token_t obj)
         if (obj != 0 && HERE(CHAIN)) return GO_UNKNOWN;
         if (HERE(CHAIN))obj = CHAIN;
         if (obj == 0 || obj == INTRANSITIVE) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
     }
@@ -728,12 +737,12 @@ static int lock(token_t verb, token_t obj)
                 if (!game.panic)game.clock2 = PANICTIME;
                 game.panic = true;
             } else {
-                game.prop[GRATE] = (verb == LOCK) ? 0 : 1;
+                game.prop[GRATE] = (verb == LOCK) ? GRATE_CLOSED : GRATE_OPEN;
                 spk = game.prop[GRATE] ? GRATE_UNLOCKED : GRATE_LOCKED;
             }
         }
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -741,34 +750,34 @@ 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 = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == BOTTLE || obj == 0)obj = LIQUID();
     if (obj == 0) return GO_UNKNOWN;
     if (!TOTING(obj)) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     spk = CANT_POUR;
     if (obj != OIL && obj != WATER) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     if (HERE(URN) && game.prop[URN] == 0)
         return fill(verb, URN);
-    game.prop[BOTTLE] = 1;
+    game.prop[BOTTLE] = EMPTY_BOTTLE;
     game.place[obj] = LOC_NOWHERE;
     spk = GROUND_WET;
     if (!(AT(PLANT) || AT(DOOR))) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     if (!AT(DOOR)) {
         spk = SHAKING_LEAVES;
         if (obj != WATER) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
-        PSPEAK(PLANT, game.prop[PLANT] + 3);
+        pspeak(PLANT, look, game.prop[PLANT] + 3);
         game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
         game.prop[PLANT2] = game.prop[PLANT];
         return GO_MOVE;
@@ -776,7 +785,7 @@ static int pour(token_t verb, token_t obj)
         game.prop[DOOR] = 0;
         if (obj == OIL)game.prop[DOOR] = 1;
         spk = RUSTED_HINGES + game.prop[DOOR];
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
 }
@@ -784,7 +793,7 @@ static int pour(token_t verb, token_t obj)
 static int quit(void)
 /*  Quit.  Intransitive only.  Verify intent and exit if that's what he wants. */
 {
-    if (YES(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+    if (yes(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
         terminate(quitgame);
     return GO_CLEAROBJ;
 }
@@ -795,26 +804,21 @@ static int read(struct command_t command)
     if (command.obj == INTRANSITIVE) {
         command.obj = 0;
         for (int i = 1; i <= NOBJECTS; i++) {
-            if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
+            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)) return GO_UNKNOWN;
+        if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
+            return GO_UNKNOWN;
     }
 
     if (DARK(game.loc)) {
-        SETPRM(1, command.wd1, command.wd1x);
-        RSPEAK(NO_SEE);
-        return GO_CLEAROBJ;
-    }
-    if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
-        RSPEAK(ACTSPK[command.verb]);
-        return GO_CLEAROBJ;
-    }
-    if (command.obj == OYSTER && !game.clshnt) {
-        game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
-        return GO_CLEAROBJ;
-    }
-    PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
+        rspeak(NO_SEE, command.wd1, command.wd1x);
+    } 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) {
+        rspeak(actions[command.verb].message);
+    } else
+        pspeak(command.obj, study, game.prop[command.obj]);
     return GO_CLEAROBJ;
 }
 
@@ -822,17 +826,17 @@ static int reservoir(void)
 /*  Z'ZZZ (word gets recomputed at startup; different each game). */
 {
     if (!AT(RESER) && game.loc != game.fixed[RESER] - 1) {
-        RSPEAK(NOTHING_HAPPENS);
+        rspeak(NOTHING_HAPPENS);
         return GO_CLEAROBJ;
     } else {
-        PSPEAK(RESER, game.prop[RESER] + 1);
+        pspeak(RESER, look, game.prop[RESER] + 1);
         game.prop[RESER] = 1 - game.prop[RESER];
         if (AT(RESER))
             return GO_CLEAROBJ;
         else {
             game.oldlc2 = game.loc;
             game.newloc = 0;
-            RSPEAK(NOT_BRIGHT);
+            rspeak(NOT_BRIGHT);
             return GO_TERMINATE;
         }
     }
@@ -841,44 +845,45 @@ static int reservoir(void)
 static int rub(token_t verb, token_t obj)
 /* Rub.  Yields various snide remarks except for lit urn. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj != LAMP)
         spk = PECULIAR_NOTHING;
     if (obj == URN && game.prop[URN] == 2) {
         DESTROY(URN);
-        DROP(AMBER, game.loc);
+        drop(AMBER, game.loc);
         game.prop[AMBER] = 1;
         --game.tally;
-        DROP(CAVITY, game.loc);
+        drop(CAVITY, game.loc);
         spk = URN_GENIES;
     }
-    RSPEAK(spk);
+    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
 static int say(struct command_t *command)
 /* Say.  Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).)  Magic words override. */
 {
-    SETPRM(1, command->wd2, command->wd2x);
-    if (command->wd2 <= 0)
-        SETPRM(1, command->wd1, command->wd1x);
-    if (command->wd2 > 0)
+    long a = command->wd1, b = command->wd1x;
+    if (command->wd2 > 0) {
+        a = command->wd2;
+        b = command->wd2x;
         command->wd1 = command->wd2;
-    int wd = VOCAB(command->wd1, -1);
+    }
+    int wd = vocab(command->wd1, -1);
     /* FIXME: Magic numbers */
     if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
-	/* FIXME: scribbles on the interpreter's command block */
+        /* FIXME: scribbles on the interpreter's command block */
         wordclear(&command->wd2);
         return GO_LOOKUP;
     }
-    RSPEAK(OKEY_DOKEY);
+    rspeak(OKEY_DOKEY, a, b);
     return GO_CLEAROBJ;
 }
 
 static int throw_support(long spk)
 {
-    RSPEAK(spk);
-    DROP(AXE, game.loc);
+    rspeak(spk);
+    drop(AXE, game.loc);
     return GO_MOVE;
 }
 
@@ -888,22 +893,22 @@ static int throw (FILE *cmdin, struct command_t *command)
  *  (Only way to do so!)  Axe also special for dragon, bear, and
  *  troll.  Treasures special for troll. */
 {
-    int spk = ACTSPK[command->verb];
+    int spk = actions[command->verb].message;
     if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
     if (!TOTING(command->obj)) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
-    if (command->obj >= MINTRS && command->obj <= MAXTRS && AT(TROLL)) {
+    if (objects[command->obj].is_treasure && AT(TROLL)) {
         spk = TROLL_SATISFIED;
         /*  Snarf a treasure for the troll. */
-        DROP(command->obj, 0);
-        MOVE(TROLL, 0);
-        MOVE(TROLL + NOBJECTS, 0);
-        DROP(TROLL2, PLAC[TROLL]);
-        DROP(TROLL2 + NOBJECTS, FIXD[TROLL]);
-        JUGGLE(CHASM);
-        RSPEAK(spk);
+        drop(command->obj, 0);
+        move(TROLL, 0);
+        move(TROLL + NOBJECTS, 0);
+        drop(TROLL2, objects[TROLL].plac);
+        drop(TROLL2 + NOBJECTS, objects[TROLL].fixd);
+        juggle(CHASM);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
     if (command->obj == FOOD && HERE(BEAR)) {
@@ -914,7 +919,7 @@ static int throw (FILE *cmdin, struct command_t *command)
     if (command->obj != AXE)
         return (discard(command->verb, command->obj, false));
     else {
-        int i = ATDWRF(game.loc);
+        int i = atdwrf(game.loc);
         if (i <= 0) {
             if (AT(DRAGON) && game.prop[DRAGON] == 0)
                 return throw_support(DRAGON_SCALES);
@@ -924,14 +929,14 @@ static int throw (FILE *cmdin, struct command_t *command)
                 return throw_support(OGRE_DODGE);
             else if (HERE(BEAR) && game.prop[BEAR] == 0) {
                 /* This'll teach him to throw the axe at the bear! */
-                DROP(AXE, game.loc);
+                drop(AXE, game.loc);
                 game.fixed[AXE] = -1;
                 game.prop[AXE] = 1;
-                JUGGLE(BEAR);
-                RSPEAK(AXE_LOST);
+                juggle(BEAR);
+                rspeak(AXE_LOST);
                 return GO_CLEAROBJ;
             }
-	    command->obj = 0;
+            command->obj = 0;
             return (attack(cmdin, command));
         }
 
@@ -950,10 +955,10 @@ static int wake(token_t verb, token_t obj)
 /* Wake.  Only use is to disturb the dwarves. */
 {
     if (obj != DWARF || !game.closed) {
-        RSPEAK(ACTSPK[verb]);
+        rspeak(actions[verb].message);
         return GO_CLEAROBJ;
     } else {
-        RSPEAK(PROD_DWARF);
+        rspeak(PROD_DWARF);
         return GO_DWARFWAKE;
     }
 }
@@ -961,34 +966,36 @@ static int wake(token_t verb, token_t obj)
 static int wave(token_t verb, token_t obj)
 /* Wave.  No effect unless waving rod at fissure or at bird. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))spk = ARENT_CARRYING;
     if (obj != ROD ||
         !TOTING(obj) ||
         (!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     }
-    if (HERE(BIRD))spk = FREE_FLY + MOD(game.prop[BIRD], 2);
+    /* FIXME: Arithemetic on proprty values */
+    if (HERE(BIRD))
+	spk = FREE_FLY + MOD(game.prop[BIRD], 2);
     if (spk == FREE_FLY && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
-        DROP(JADE, game.loc);
+        drop(JADE, game.loc);
         game.prop[JADE] = 0;
         --game.tally;
         spk = NECKLACE_FLY;
-        RSPEAK(spk);
+        rspeak(spk);
         return GO_CLEAROBJ;
     } else {
         if (game.closed) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_DWARFWAKE;
         }
         if (game.closng || !AT(FISSURE)) {
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
-        if (HERE(BIRD))RSPEAK(spk);
+        if (HERE(BIRD))rspeak(spk);
         game.prop[FISSURE] = 1 - game.prop[FISSURE];
-        PSPEAK(FISSURE, 2 - game.prop[FISSURE]);
+        pspeak(FISSURE, look, 2 - game.prop[FISSURE]);
         return GO_CLEAROBJ;
     }
 }
@@ -998,7 +1005,7 @@ int action(FILE *input, struct command_t *command)
  *  unless verb is "say", which snarfs arbitrary second word.
  */
 {
-    token_t spk = ACTSPK[command->verb];
+    token_t spk = actions[command->verb].message;
 
     if (command->part == unknown) {
         /*  Analyse an object word.  See if the thing is here, whether
@@ -1016,9 +1023,7 @@ int action(FILE *input, struct command_t *command)
             if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
                 game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
                 command->obj = ENTRNC;
-            if (command->obj != GRATE)
-                return GO_MOVE;
-        } else if (command->obj == DWARF && ATDWRF(game.loc) > 0)
+        } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
             /* FALL THROUGH */;
         else if ((LIQUID() == command->obj && HERE(BOTTLE)) || command->obj == LIQLOC(game.loc))
             /* FALL THROUGH */;
@@ -1031,7 +1036,7 @@ int action(FILE *input, struct command_t *command)
         } else if (command->obj == KNIFE && game.knfloc == game.loc) {
             game.knfloc = -1;
             spk = KNIVES_VANISH;
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         } else if (command->obj == ROD && HERE(ROD2)) {
             command->obj = ROD2;
@@ -1039,8 +1044,7 @@ int action(FILE *input, struct command_t *command)
         } else if ((command->verb == FIND || command->verb == INVENT) && command->wd2 <= 0)
             /* FALL THROUGH */;
         else {
-            SETPRM(1, command->wd1, command->wd1x);
-            RSPEAK(NO_SEE);
+            rspeak(NO_SEE, command->wd1, command->wd1x);
             return GO_CLEAROBJ;
         }
 
@@ -1059,7 +1063,7 @@ int action(FILE *input, struct command_t *command)
             /*  Analyse an intransitive verb (ie, no object given yet). */
             switch (command->verb - 1) {
             case  0: /* CARRY */
-                return carry(command->verb, INTRANSITIVE);
+                return vcarry(command->verb, INTRANSITIVE);
             case  1: /* DROP  */
                 return GO_UNKNOWN;
             case  2: /* SAY   */
@@ -1067,7 +1071,7 @@ int action(FILE *input, struct command_t *command)
             case  3: /* UNLOC */
                 return lock(command->verb, INTRANSITIVE);
             case  4: { /* NOTHI */
-                RSPEAK(OK_MAN);
+                rspeak(OK_MAN);
                 return (GO_CLEAROBJ);
             }
             case  5: /* LOCK  */
@@ -1081,7 +1085,7 @@ int action(FILE *input, struct command_t *command)
             case  9: /* CALM  */
                 return GO_UNKNOWN;
             case 10: { /* WALK  */
-                RSPEAK(spk);
+                rspeak(spk);
                 return GO_CLEAROBJ;
             }
             case 11: /* ATTAC */
@@ -1141,7 +1145,7 @@ int action(FILE *input, struct command_t *command)
         /*  Analyse a transitive verb. */
         switch (command->verb - 1) {
         case  0: /* CARRY */
-            return carry(command->verb, command->obj);
+            return vcarry(command->verb, command->obj);
         case  1: /* DROP  */
             return discard(command->verb, command->obj, false);
         case  2: /* SAY   */
@@ -1149,7 +1153,7 @@ int action(FILE *input, struct command_t *command)
         case  3: /* UNLOC */
             return lock(command->verb, command->obj);
         case  4: { /* NOTHI */
-            RSPEAK(OK_MAN);
+            rspeak(OK_MAN);
             return (GO_CLEAROBJ);
         }
         case  5: /* LOCK  */
@@ -1161,11 +1165,11 @@ int action(FILE *input, struct command_t *command)
         case  8: /* WAVE  */
             return wave(command->verb, command->obj);
         case  9: { /* CALM  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 10: { /* WALK  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 11: /* ATTAC */
@@ -1181,7 +1185,7 @@ int action(FILE *input, struct command_t *command)
         case 16: /* TOSS  */
             return throw(input, command);
         case 17: { /* QUIT  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 18: /* FIND  */
@@ -1196,15 +1200,15 @@ int action(FILE *input, struct command_t *command)
             blast();
             return GO_CLEAROBJ;
         case 23: { /* SCOR  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 24: { /* FOO   */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 25: { /* BRIEF */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 26: /* READ  */
@@ -1214,17 +1218,17 @@ int action(FILE *input, struct command_t *command)
         case 28: /* WAKE  */
             return wake(command->verb, command->obj);
         case 29: { /* SUSP  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 30: { /* RESU  */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 31: /* FLY   */
             return fly(command->verb, command->obj);
         case 32: { /* LISTE */
-            RSPEAK(spk);
+            rspeak(spk);
             return GO_CLEAROBJ;
         }
         case 33: /* ZZZZ  */
@@ -1233,8 +1237,7 @@ int action(FILE *input, struct command_t *command)
         BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST);
     case unknown:
         /* Unknown verb, couldn't deduce object - might need hint */
-        SETPRM(1, command->wd1, command->wd1x);
-        RSPEAK(WHAT_DO);
+        rspeak(WHAT_DO, command->wd1, command->wd1x);
         return GO_CHECKHINT;
     default:
         BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN);