X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=3e6933c615943bac7b8298132b736a852b6806c2;hb=d80abbce02cade54cdee4dc536c4e7ec7121e30d;hp=df76463cc9cf8650d2a5f7fd32c5c8d940c19b27;hpb=b92fb66c44fd6f41bd16914a845e18ab09ac39d5;p=open-adventure.git

diff --git a/actions.c b/actions.c
index df76463..3e6933c 100644
--- a/actions.c
+++ b/actions.c
@@ -3,6 +3,11 @@
 #include "advent.h"
 #include "database.h"
 
+/* Limit visibility of ugly globals.  Eventually these should go away. */
+extern long WD1, WD1X, WD2, WD2X;
+
+static long SPK;	/* This should go away too */
+
 /*
  * Action handlers.  Eventually we'll do lookup through a method table
  * that calls these.  Absolutely nothing like the original FORTRAN.
@@ -38,7 +43,11 @@ static int attack(FILE *input, long verb, long obj)
     }
     if (obj == BIRD) {
 	SPK=137;
-	if (game.closed) return(2011);
+	if (game.closed)
+	{
+	    RSPEAK(SPK);
+	    return 2012;
+	}
 	DSTROY(BIRD);
 	game.prop[BIRD]=0;
 	SPK=45;
@@ -70,10 +79,11 @@ static int attack(FILE *input, long verb, long obj)
 	    }
 	}
 	SPK=SPK+1+1/k;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
     if (obj == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
-    if (obj != DRAGON || game.prop[DRAGON] != 0) return(2011);
+    if (obj != DRAGON || game.prop[DRAGON] != 0) {RSPEAK(SPK); return 2012;}
     /*  Fun stuff for dragon.  If he insists on attacking it, win!
      *  Set game.prop to dead, move dragon to central loc (still
      *  fixed), move rug there (not fixed), and move him there,
@@ -96,7 +106,6 @@ static int attack(FILE *input, long verb, long obj)
 	    MOVE(obj,k);
     }
     game.loc=k;
-    K=NUL;	/* FIXME: error if removed */
     return(8);
 }
 
@@ -109,13 +118,19 @@ static int bigwords(long foo)
     SPK=42;
     if (game.foobar != 1-k) {
 	if (game.foobar != 0)SPK=151;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     } else {
 	game.foobar=k;
-	if (k != 4) return(2009);
+	if (k != 4) {
+	    RSPEAK(54);
+	    return 2012;
+	}
 	game.foobar=0;
-	if (game.place[EGGS] == PLAC[EGGS] || (TOTING(EGGS) && game.loc == PLAC[EGGS])) 
-	    return(2011);
+	if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
+	    RSPEAK(SPK);
+	    return 2012;
+	}
 	/*  Bring back troll if we steal the eggs back from him before
 	 *  crossing. */
 	if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0)
@@ -132,27 +147,34 @@ static int bigwords(long foo)
 static int bivalve(token_t verb, token_t obj)
 /* Clam/oyster actions */
 {
-    int k=0;
+    int spk, k=0;
     if (obj == OYSTER)k=1;
-    SPK=124+k;
-    if (TOTING(obj))SPK=120+k;
-    if (!TOTING(TRIDNT))SPK=122+k;
-    if (verb == LOCK)SPK=61;
-    if (SPK != 124)
-	return(2011);
-    DSTROY(CLAM);
-    DROP(OYSTER,game.loc);
-    DROP(PEARL,105);
-    return(2011);
+    spk=124+k;
+    if (TOTING(obj))spk=120+k;
+    if (!TOTING(TRIDNT))spk=122+k;
+    if (verb == LOCK)spk=61;
+    if (spk == 124) {
+	DSTROY(CLAM);
+	DROP(OYSTER,game.loc);
+	DROP(PEARL,105);
+    }
+    RSPEAK(spk);
+    return 2012;
 }
 
 static int blast(void)
 /*  Blast.  No effect unless you've got dynamite, which is a neat trick! */
 {
-    if (game.prop[ROD2] < 0 || !game.closed) return(2011);
+    if (game.prop[ROD2] < 0 || !game.closed)
+    {
+	RSPEAK(67);
+	return 2012;
+    }
     game.bonus=133;
-    if (game.loc == 115)game.bonus=134;
-    if (HERE(ROD2))game.bonus=135;
+    if (game.loc == 115)
+	game.bonus=134;
+    if (HERE(ROD2))
+	game.bonus=135;
     RSPEAK(game.bonus);
     score(0);
 }
@@ -160,27 +182,30 @@ static int blast(void)
 static int vbreak(token_t obj)
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
 {
+    /* FIXME: defaults from ACTSPK */
     if (obj == MIRROR)SPK=148;
     if (obj == VASE && game.prop[VASE] == 0) {
 	SPK=198;
 	if (TOTING(VASE))DROP(VASE,game.loc);
 	game.prop[VASE]=2;
 	game.fixed[VASE]= -1;
-	return(2011);
     } else {
-	if (obj != MIRROR || !game.closed) return(2011);
-	SPK=197;
-	return(18999);
+	if (obj == MIRROR && game.closed) {
+	    RSPEAK(197);
+	    return(190000);
+	}
     }
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int brief(void)
 /*  Brief.  Intransitive only.  Suppress long descriptions after first time. */
 {
-    SPK=156;
     game.abbnum=10000;
     game.detail=3;
-    return(2011);
+    RSPEAK(156);
+    return 2012;
 }
 
 static int carry(long obj)
@@ -188,6 +213,7 @@ static int carry(long obj)
  *  take one without the other).  Liquids also special, since they depend on
  *  status of bottle.  Also various side effects, etc. */
 {
+    int spk;
     if (obj == INTRANSITIVE) {
 	/*  Carry, no object given yet.  OK if only one object present. */
 	if(game.atloc[game.loc] == 0 ||
@@ -197,82 +223,93 @@ static int carry(long obj)
 	obj=game.atloc[game.loc];
     }
 
-    if (TOTING(obj)) return(2011);
-    SPK=25;
-    if (obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
-    if (obj == BEAR && game.prop[BEAR] == 1)SPK=169;
-    if (obj == CHAIN && game.prop[BEAR] != 0)SPK=170;
-    if (obj == URN)SPK=215;
-    if (obj == CAVITY)SPK=217;
-    if (obj == BLOOD)SPK=239;
-    if (obj == RUG && game.prop[RUG] == 2)SPK=222;
-    if (obj == SIGN)SPK=196;
+    if (TOTING(obj)) {RSPEAK(24); return 2012;}
+    spk=25;
+    if (obj == PLANT && game.prop[PLANT] <= 0)spk=115;
+    if (obj == BEAR && game.prop[BEAR] == 1)spk=169;
+    if (obj == CHAIN && game.prop[BEAR] != 0)spk=170;
+    if (obj == URN)spk=215;
+    if (obj == CAVITY)spk=217;
+    if (obj == BLOOD)spk=239;
+    if (obj == RUG && game.prop[RUG] == 2)spk=222;
+    if (obj == SIGN)spk=196;
     if (obj == MESSAG) {
-	SPK=190;
+	spk=190;
+	return 2012;
 	DSTROY(MESSAG);
     }
-    if (game.fixed[obj] != 0)
-	return(2011);
+    if (game.fixed[obj] != 0) {
+	RSPEAK(spk);
+	return 2012;
+    }
     if (obj == WATER || obj == OIL) {
-	if (!HERE(BOTTLE) || LIQ(0) != obj) {
+	if (!HERE(BOTTLE) || LIQUID() != obj) {
 	    if (TOTING(BOTTLE) && game.prop[BOTTLE] == 1)
 		return(fill(BOTTLE));
-	    if (game.prop[BOTTLE] != 1)SPK=105;
-	    if (!TOTING(BOTTLE))SPK=104;
-	    return(2011);
+	    if (game.prop[BOTTLE] != 1)spk=105;
+	    if (!TOTING(BOTTLE))spk=104;
+	    RSPEAK(spk);
+	    return 2012;
 	}
 	obj = BOTTLE;
     }
 
-    SPK=92;
-    if (game.holdng >= INVLIMIT)
-	return(2011);
-    if (obj == BIRD && game.prop[BIRD] != 1 && -1-game.prop[BIRD] != 1) {
+    spk=92;
+    if (game.holdng >= INVLIMIT) {
+	RSPEAK(spk);
+	return 2012;
+    }
+    else if (obj == BIRD && game.prop[BIRD] != 1 && -1-game.prop[BIRD] != 1) {
 	if (game.prop[BIRD] == 2) {
-	    SPK=238;
 	    DSTROY(BIRD);
-	    return(2011);
+	    RSPEAK(238);
+	    return 2012;
+	}
+	if (!TOTING(CAGE))spk=27;
+	if (TOTING(ROD))spk=26;
+	if (spk/2 == 13) {
+	    RSPEAK(spk);
+	    return 2012;
 	}
-	if (!TOTING(CAGE))SPK=27;
-	if (TOTING(ROD))SPK=26;
-	if (SPK/2 == 13) return(2011);
 	game.prop[BIRD]=1;
     }
     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 == BOTTLE && LIQ(0) != 0)
-	game.place[LIQ(0)] = -1;
-    if (!GSTONE(obj) || game.prop[obj] == 0)
-	return(2009);
-    game.prop[obj]=0;
-    game.prop[CAVITY]=1;
-    return(2009);
+    if (obj == BOTTLE && LIQUID() != 0)
+	game.place[LIQUID()] = -1;
+    if (GSTONE(obj) && game.prop[obj] != 0) {
+	game.prop[obj]=0;
+	game.prop[CAVITY]=1;
+    }
+    RSPEAK(54);
+    return(2012);
 }
 
 static int chain(token_t verb)
 /* Do something to the bear's chain */
 {
+    int spk;
     if (verb != LOCK) {
-	SPK=171;
-	if (game.prop[BEAR] == 0)SPK=41;
-	if (game.prop[CHAIN] == 0)SPK=37;
-	if (SPK != 171) return(2011);
+	spk=171;
+	if (game.prop[BEAR] == 0)spk=41;
+	if (game.prop[CHAIN] == 0)spk=37;
+	if (spk != 171) {RSPEAK(spk); return 2012;}
 	game.prop[CHAIN]=0;
 	game.fixed[CHAIN]=0;
 	if (game.prop[BEAR] != 3)game.prop[BEAR]=2;
 	game.fixed[BEAR]=2-game.prop[BEAR];
-	return(2011);
     } else {
-	SPK=172;
-	if (game.prop[CHAIN] != 0)SPK=34;
-	if (game.loc != PLAC[CHAIN])SPK=173;
-	if (SPK != 172) return(2011);
+	spk=172;
+	if (game.prop[CHAIN] != 0)spk=34;
+	if (game.loc != PLAC[CHAIN])spk=173;
+	if (spk != 172) {RSPEAK(spk); return 2012;}
 	game.prop[CHAIN]=2;
 	if (TOTING(CHAIN))DROP(CHAIN,game.loc);
 	game.fixed[CHAIN]= -1;
-	return(2011);
     }
+    RSPEAK(spk);
+    return 2012;
 }
 
 static int discard(long obj, bool just_do_it)
@@ -282,7 +319,7 @@ static int discard(long obj, bool just_do_it)
 {
     if (!just_do_it) {
         if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
-        if (!TOTING(obj)) return(2011);
+        if (!TOTING(obj)) {RSPEAK(SPK); return 2012;}
         if (obj == BIRD && HERE(SNAKE)) {
             RSPEAK(30);
             if (game.closed) return(19000);
@@ -301,10 +338,10 @@ static int discard(long obj, bool just_do_it)
                 if (obj == RUBY)SPK=221;
                 RSPEAK(SPK);
                 if (SPK != 220) {
-                    K=2-game.prop[RUG];
-                    game.prop[RUG]=K;
-                    if (K == 2)K=PLAC[SAPPH];
-                    MOVE(RUG+NOBJECTS,K);
+                    int k = 2-game.prop[RUG];
+                    game.prop[RUG] = k;
+                    if (k == 2) k = PLAC[SAPPH];
+                    MOVE(RUG+NOBJECTS, k);
                 }
             }
         } else if (obj == COINS && HERE(VEND)) {
@@ -334,9 +371,10 @@ static int discard(long obj, bool just_do_it)
             if (game.prop[VASE] != 0)game.fixed[VASE]= -1;
         }
     }
-    K=LIQ(0);
-    if (K == obj)obj=BOTTLE;
-    if (obj == BOTTLE && K != 0)game.place[K]=0;
+    int k = LIQUID();
+    if (k == obj)obj=BOTTLE;
+    if (obj == BOTTLE && k != 0)
+	game.place[k]=0;
     if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
     DROP(obj,game.loc);
     if (obj != BIRD) return(2012);
@@ -349,21 +387,23 @@ static int drink(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 == 0 && LIQLOC(game.loc) != WATER && (LIQ(0) != WATER || !HERE(BOTTLE)))
+    if (obj == 0 && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
 	return(8000);
     if (obj != BLOOD) {
 	if (obj != 0 && obj != WATER)SPK=110;
-	if (SPK == 110 || LIQ(0) != WATER || !HERE(BOTTLE)) return(2011);
+	if (SPK == 110 || LIQUID() != WATER || !HERE(BOTTLE)) {RSPEAK(SPK); return 2012;}
 	game.prop[BOTTLE]=1;
 	game.place[WATER]=0;
 	SPK=74;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     } else {
 	DSTROY(BLOOD);
 	game.prop[DRAGON]=2;
 	OBJSND[BIRD]=OBJSND[BIRD]+3;
 	SPK=240;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
 }
 
@@ -376,18 +416,17 @@ static int eat(token_t obj)
 	    return(8000);
 	DSTROY(FOOD);
 	SPK=72;
-	return(2011);
     } else {
 	if (obj == FOOD) {
 	    DSTROY(FOOD);
 	    SPK=72;
-	    return(2011);
 	}
 	if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
 	   DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
 	   OGRE)SPK=71;
-	return(2011);
     }
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int extinguish(int obj)
@@ -396,24 +435,26 @@ static int extinguish(int obj)
     if (obj == INTRANSITIVE) {
 	if (HERE(LAMP) && game.prop[LAMP] == 1)obj=LAMP;
 	if (HERE(URN) && game.prop[URN] == 2)obj=obj*NOBJECTS+URN;
-	if (obj == 0 || obj > NOBJECTS) return(8000);
+	if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return(8000);
     }
 
     if (obj == URN) {
 	game.prop[URN]=game.prop[URN]/2;
 	SPK=210;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
-    if (obj == LAMP) {
+    else if (obj == LAMP) {
 	game.prop[LAMP]=0;
 	RSPEAK(40);
-	if (DARK(0))
+	if (DARK(game.loc))
 	    RSPEAK(16);
 	return(2012);
     }
-    if (obj == DRAGON || obj == VOLCAN)
+    else if (obj == DRAGON || obj == VOLCAN)
 	SPK=146;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int feed(long obj)
@@ -421,51 +462,62 @@ static int feed(long obj)
  *  mad.  Bear, special. */
 {
     if (obj == BIRD) {
-	SPK=100;
-	return(2011);
+	RSPEAK(100);
+	return 2012;
     }
 
     if (!(obj != SNAKE && obj != DRAGON && obj != TROLL)) {
-	SPK=102;
-	if (obj == DRAGON && game.prop[DRAGON] != 0)SPK=110;
-	if (obj == TROLL)SPK=182;
+	int spk=102;
+	if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
+	if (obj == TROLL)spk=182;
 	if (obj != SNAKE || game.closed || !HERE(BIRD))
-	    return(2011);
-	SPK=101;
+	{
+	    RSPEAK(spk);
+	    return 2012;
+	}
 	DSTROY(BIRD);
 	game.prop[BIRD]=0;
-	return(2011);
+	RSPEAK(101);
+	return 2012;
     }
 
     if (obj == DWARF) {
 	if (!HERE(FOOD))
-	    return(2011);
-	SPK=103;
+	{
+	    RSPEAK(SPK);	/* FIXME: Defaults from ACTSPK */
+	    return 2012;
+	}
 	game.dflag=game.dflag+2;
-	return(2011);
+	RSPEAK(103);
+	return 2012;
     }
 
     if (obj == BEAR) {
 	if (game.prop[BEAR] == 0)SPK=102;
 	if (game.prop[BEAR] == 3)SPK=110;
-	if (!HERE(FOOD))
-	    return(2011);
+	if (!HERE(FOOD)) {
+	    RSPEAK(SPK);
+	    return 2012;
+	}
 	DSTROY(FOOD);
 	game.prop[BEAR]=1;
 	game.fixed[AXE]=0;
 	game.prop[AXE]=0;
 	SPK=168;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
 
     if (obj == OGRE) {
 	if (HERE(FOOD))
 	    SPK=202;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
 
     SPK=14;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 int fill(long obj)
@@ -476,8 +528,10 @@ int fill(long obj)
     if (obj == VASE) {
 	SPK=29;
 	if (LIQLOC(game.loc) == 0)SPK=144;
-	if (LIQLOC(game.loc) == 0 || !TOTING(VASE))
-	    return(2011);
+	if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
+	    RSPEAK(SPK);
+	    return 2012;
+	}
 	RSPEAK(145);
 	game.prop[VASE]=2;
 	game.fixed[VASE]= -1;
@@ -486,19 +540,22 @@ int fill(long obj)
 
     if (obj == URN){
 	SPK=213;
-	if (game.prop[URN] != 0) return(2011);
+	if (game.prop[URN] != 0) {RSPEAK(SPK); return 2012;}
 	SPK=144;
-	k=LIQ(0);
-	if (k == 0 || !HERE(BOTTLE)) return(2011);
+	k=LIQUID();
+	if (k == 0 || !HERE(BOTTLE)) {RSPEAK(SPK); return 2012;}
 	game.place[k]=0;
 	game.prop[BOTTLE]=1;
 	if (k == OIL)game.prop[URN]=1;
 	SPK=211+game.prop[URN];
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
 
-    if (obj != 0 && obj != BOTTLE)
-	return(2011);
+    if (obj != 0 && obj != BOTTLE) {
+	RSPEAK(SPK);
+	return 2012;
+    }
     if (obj == 0 && !HERE(BOTTLE))
 	return(8000);
     SPK=107;
@@ -506,30 +563,32 @@ int fill(long obj)
 	SPK=106;
     if (HERE(URN) && game.prop[URN] != 0)
 	SPK=214;
-    if (LIQ(0) != 0)
+    if (LIQUID() != 0)
 	SPK=105;
     if (SPK != 107)
-	return(2011);
+	{RSPEAK(SPK); return 2012;}
     game.prop[BOTTLE]=MOD(COND[game.loc],4)/2*2;
-    k=LIQ(0);
+    k=LIQUID();
     if (TOTING(BOTTLE))
 	game.place[k]= -1;
     if (k == OIL)
 	SPK=108;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int find(token_t obj)
 /* Find.  Might be carrying it, or it might be here.  Else give caveat. */
 {
     if (AT(obj) ||
-       (LIQ(0) == obj && AT(BOTTLE)) ||
+       (LIQUID() == obj && AT(BOTTLE)) ||
        obj == LIQLOC(game.loc) ||
        (obj == DWARF && ATDWRF(game.loc) > 0))
 	SPK=94;
     if (game.closed)SPK=138;
     if (TOTING(obj))SPK=24;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int fly(token_t obj)
@@ -538,13 +597,19 @@ static int fly(token_t obj)
     if (obj == INTRANSITIVE) {
 	if (game.prop[RUG] != 2)SPK=224;
 	if (!HERE(RUG))SPK=225;
-	if (SPK/2 == 112) return(2011);
+	if (SPK/2 == 112) {
+	    RSPEAK(SPK);
+	    return 2012;
+	}
 	obj=RUG;
     }
 
-    if (obj != RUG) return(2011);
+    if (obj != RUG) {
+	RSPEAK(SPK);
+	return 2012;
+    }
     SPK=223;
-    if (game.prop[RUG] != 2) return(2011);
+    if (game.prop[RUG] != 2) {RSPEAK(SPK); return 2012;}
     game.oldlc2=game.oldloc;
     game.oldloc=game.loc;
     game.newloc=game.place[RUG]+game.fixed[RUG]-game.loc;
@@ -562,7 +627,8 @@ static int inven(token_t obj)
     for (i=1; i<=NOBJECTS; i++) {
 	if (i == BEAR || !TOTING(i))
 	    continue;
-	if (SPK == 98)RSPEAK(99);
+	if (SPK == 98)
+	    RSPEAK(99);
 	game.blklin=false;
 	PSPEAK(i,-1);
 	game.blklin=true;
@@ -570,32 +636,43 @@ static int inven(token_t obj)
     }
     if (TOTING(BEAR))
 	SPK=141;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 int light(token_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
+    int spk;
     if (obj == INTRANSITIVE) {
 	if (HERE(LAMP) && game.prop[LAMP] == 0 && game.limit >= 0)obj=LAMP;
 	if (HERE(URN) && game.prop[URN] == 1)obj=obj*NOBJECTS+URN;
-	if (obj == 0 || obj > NOBJECTS) return(8000);
+	if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return(8000);
     }
 
     if (obj == URN) {
-	SPK=38;
+	spk=38;
 	if (game.prop[URN] == 0)
-	    return(2011);
-	SPK=209;
+	    {RSPEAK(spk); return 2012;}
+	spk=209;
 	game.prop[URN]=2;
-	return(2011);
+	RSPEAK(spk);
+	return 2012;
     } else {
-	if (obj != LAMP) return(2011);
-	SPK=184;
-	if (game.limit < 0) return(2011);
+	if (obj != LAMP)
+	{
+	    RSPEAK(spk);
+	    return 2012;
+	}
+	spk=184;
+	if (game.limit < 0) {
+	    RSPEAK(spk);
+	    return 2012;
+	}
 	game.prop[LAMP]=1;
 	RSPEAK(39);
-	if (game.wzdark) return(2000);
+	if (game.wzdark)
+	    return(2000);
 	return(2012);
     }	 
 }
@@ -604,23 +681,24 @@ static int listen(void)
 /*  Listen.  Intransitive only.  Print stuff based on objsnd/locsnd. */
 {
     int i, k;
-    SPK=228;
+    int spk=228;
     k=LOCSND[game.loc];
     if (k != 0) {
 	RSPEAK(labs(k));
 	if (k < 0) return(2012);
-	SPK=0;
+	spk=0;
     }
     SETPRM(1,game.zzword,0);
     for (i=1; i<=NOBJECTS; i++) {
 	if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
 	    continue;
 	PSPEAK(i,OBJSND[i]+game.prop[i]);
-	SPK=0;
+	spk=0;
 	if (i == BIRD && OBJSND[i]+game.prop[i] == 8)
 	    DSTROY(BIRD);
     }
-    return(2011);
+    RSPEAK(spk);
+    return 2012;
 }
 
 static int lock(token_t verb, token_t obj)
@@ -635,7 +713,7 @@ static int lock(token_t verb, token_t obj)
 	if (AT(GRATE))obj=GRATE;
 	if (obj != 0 && HERE(CHAIN)) return(8000);
 	if (HERE(CHAIN))obj=CHAIN;
-	if (obj == 0) return(2011);
+	if (obj == 0) {RSPEAK(SPK); return 2012;}
     }
 	
     /*  Lock, unlock object.  Special stuff for opening clam/oyster
@@ -647,51 +725,56 @@ static int lock(token_t verb, token_t obj)
     if (obj == CAGE)SPK=32;
     if (obj == KEYS)SPK=55;
     if (obj == GRATE || obj == CHAIN)SPK=31;
-    if (SPK != 31 || !HERE(KEYS)) return(2011);
+    if (SPK != 31 || !HERE(KEYS)) {
+	RSPEAK(SPK);
+	return 2012;
+    }
     if (obj == CHAIN)
 	return chain(verb);
     if (game.closng) {
 	SPK=130;
 	if (!game.panic)game.clock2=15;
 	game.panic=true;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
     SPK=34+game.prop[GRATE];
     game.prop[GRATE]=1;
     if (verb == LOCK)game.prop[GRATE]=0;
     SPK=SPK+2*game.prop[GRATE];
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int pour(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. */
 {
-    if (obj == BOTTLE || obj == 0)obj=LIQ(0);
+    if (obj == BOTTLE || obj == 0)obj=LIQUID();
     if (obj == 0) return(8000);
-    if (!TOTING(obj)) return(2011);
+    if (!TOTING(obj)) {RSPEAK(SPK); return 2012;}
     SPK=78;
-    if (obj != OIL && obj != WATER) return(2011);
+    if (obj != OIL && obj != WATER) {RSPEAK(SPK); return 2012;}
     if (HERE(URN) && game.prop[URN] == 0)
 	return fill(URN);
     game.prop[BOTTLE]=1;
     game.place[obj]=0;
     SPK=77;
     if (!(AT(PLANT) || AT(DOOR)))
-	return(2011);
+	{RSPEAK(SPK); return 2012;}
     if (!AT(DOOR)) {
 	SPK=112;
-	if (obj != WATER) return(2011);
+	if (obj != WATER) {RSPEAK(SPK); return 2012;}
 	PSPEAK(PLANT,game.prop[PLANT]+3);
 	game.prop[PLANT]=MOD(game.prop[PLANT]+1,3);
 	game.prop[PLANT2]=game.prop[PLANT];
-	K=NUL;
 	return(8);
     } else {
 	game.prop[DOOR]=0;
 	if (obj == OIL)game.prop[DOOR]=1;
 	SPK=113+game.prop[DOOR];
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     }
 }
 
@@ -713,16 +796,16 @@ static int read(FILE *input, token_t obj)
 	    if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
 		obj = obj * NOBJECTS + i;
 	}
-	if (obj > NOBJECTS || obj == 0 || DARK(0)) return(8000);
+	if (obj > NOBJECTS || obj == 0 || DARK(game.loc)) return(8000);
     }
 	
-    if (DARK(0)) {
+    if (DARK(game.loc)) {
 	SETPRM(1,WD1,WD1X);
 	RSPEAK(256);
 	return(2012);
     }
     if (OBJTXT[obj] == 0 || game.prop[obj] < 0)
-	return(2011);
+	{RSPEAK(SPK); return 2012;}
     if (obj == OYSTER && !game.clshnt) {
 	game.clshnt=YES(input,192,193,54);
 	return(2012);
@@ -734,7 +817,7 @@ static int read(FILE *input, token_t obj)
 static int reservoir(void)
 /*  Z'ZZZ (word gets recomputed at startup; different each game). */
 {
-    if (!AT(RESER) && game.loc != game.fixed[RESER]-1) return(2011);
+    if (!AT(RESER) && game.loc != game.fixed[RESER]-1) {RSPEAK(SPK); return 2012;}
     PSPEAK(RESER,game.prop[RESER]+1);
     game.prop[RESER]=1-game.prop[RESER];
     if (AT(RESER)) return(2012);
@@ -748,14 +831,15 @@ static int rub(token_t obj)
 /* Rub.  Yields various snide remarks except for lit urn. */
 {
     if (obj != LAMP)SPK=76;
-    if (obj != URN || game.prop[URN] != 2) return(2011);
+    if (obj != URN || game.prop[URN] != 2) {RSPEAK(SPK); return 2012;}
     DSTROY(URN);
     DROP(AMBER,game.loc);
     game.prop[AMBER]=1;
     --game.tally;
     DROP(CAVITY,game.loc);
     SPK=216;
-    return(2011);
+    RSPEAK(SPK);
+    return 2012;
 }
 
 static int say(void)
@@ -770,7 +854,7 @@ static int say(void)
 	return(2630);
     }
     RSPEAK(258);
-    return(2012);
+    return 2012;
 
 }
 
@@ -778,7 +862,6 @@ static int throw_support(long spk)
 {
     RSPEAK(spk);
     DROP(AXE,game.loc);
-    K=NUL;
     return(8);
 }
 
@@ -789,8 +872,10 @@ static int throw(FILE *cmdin, long verb, long obj)
  *  troll.  Treasures special for troll. */
 {
     if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
-    if (!TOTING(obj))
-	return(2011);
+    if (!TOTING(obj)) {
+	RSPEAK(SPK);	/* FIXME: Defaults from ACTSPK */
+	return 2012;
+    }
     if (obj >= 50 && obj <= MAXTRS && AT(TROLL)) {
         SPK=159;
         /*  Snarf a treasure for the troll. */
@@ -800,7 +885,8 @@ static int throw(FILE *cmdin, long verb, long obj)
         DROP(TROLL2,PLAC[TROLL]);
         DROP(TROLL2+NOBJECTS,FIXD[TROLL]);
         JUGGLE(CHASM);
-        return(2011);
+        RSPEAK(SPK);
+	return 2012;
     }
     if (obj == FOOD && HERE(BEAR)) {
     /* But throwing food is another story. */
@@ -830,7 +916,7 @@ static int throw(FILE *cmdin, long verb, long obj)
             game.fixed[AXE]= -1;
             game.prop[AXE]=1;
             JUGGLE(BEAR);
-            return(2011);
+            {RSPEAK(SPK); return 2012;}
         }
         return(attack(cmdin, verb, 0));
     }
@@ -852,15 +938,15 @@ static int vscore(void)
 /* Score.  Call scoring routine but tell it to return. */
 {
     score(-1);
-    return(2012);
+    return 2012;
 }
 
 static int wake(token_t obj)
 /* Wake.  Only use is to disturb the dwarves. */
 {
-    if (obj != DWARF || !game.closed) return(2011);
-    SPK=199;
-    return(18999);
+    if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
+    RSPEAK(199);
+    return(19000);
 }
 
 static int wave(token_t obj)
@@ -869,22 +955,28 @@ static int wave(token_t obj)
     if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))SPK=29;
     if (obj != ROD ||
        !TOTING(obj) ||
-       (!HERE(BIRD) && (game.closng || !AT(FISSUR))))
-	return(2011);
+       (!HERE(BIRD) && (game.closng || !AT(FISSUR)))) {
+	RSPEAK(SPK);
+	return 2012;
+    }
     if (HERE(BIRD))SPK=206+MOD(game.prop[BIRD],2);
     if (SPK == 206 && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
 	DROP(JADE,game.loc);
 	game.prop[JADE]=0;
 	--game.tally;
 	SPK=208;
-	return(2011);
+	RSPEAK(SPK);
+	return 2012;
     } else {
-	if (game.closed) return(18999);
-	if (game.closng || !AT(FISSUR)) return(2011);
+	if (game.closed) {
+	    RSPEAK(SPK);	/* FIXME: How is SPK set here? */
+	    return(19000);
+	}
+	if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
 	if (HERE(BIRD))RSPEAK(SPK);
 	game.prop[FISSUR]=1-game.prop[FISSUR];
 	PSPEAK(FISSUR,2-game.prop[FISSUR]);
-	return(2012);
+	return 2012;
     }
 }
 
@@ -897,56 +989,56 @@ int action(FILE *input, enum speechpart part, long verb, long obj)
 
     if (part == unknown)
     {
-	    /*  Analyse an object word.  See if the thing is here, whether
-	     *  we've got a verb yet, and so on.  Object must be here
-	     *  unless verb is "find" or "invent(ory)" (and no new verb
-	     *  yet to be analysed).  Water and oil are also funny, since
-	     *  they are never actually dropped at any location, but might
-	     *  be here inside the bottle or urn or as a feature of the
-	     *  location. */
-	    if (HERE(obj))
-		/* FALL THROUGH */;
-	    else if (obj == GRATE) {
-		if (game.loc == 1 || game.loc == 4 || game.loc == 7)
-		    obj=DPRSSN;
-		if (game.loc > 9 && game.loc < 15)
-		    obj=ENTRNC;
-		if (obj != GRATE)
-		    return(8);
-	    }
-	    else if (obj == DWARF && ATDWRF(game.loc) > 0)
-		/* FALL THROUGH */;
-	    else if ((LIQ(0) == obj && HERE(BOTTLE)) || obj == LIQLOC(game.loc))
-		/* FALL THROUGH */;
-	    else if (obj == OIL && HERE(URN) && game.prop[URN] != 0) {
-		obj=URN;
-		/* FALL THROUGH */;
-	    }
-	    else if (obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != 0) {
-		obj=PLANT2;
-		/* FALL THROUGH */;
-	    }
-	    else if (obj == KNIFE && game.knfloc == game.loc) {
-		game.knfloc= -1;
-		SPK=116;
-		return(2011);
-	    }
-	    else if (obj == ROD && HERE(ROD2)) {
-		obj=ROD2;
-		/* FALL THROUGH */;
-	    }
-	    else if ((verb == FIND || verb == INVENT) && WD2 <= 0)
-		/* FALL THROUGH */;
-	    else {
-		SETPRM(1,WD1,WD1X);
-		RSPEAK(256);
-		return(2012);
-	    }
+	/*  Analyse an object word.  See if the thing is here, whether
+	 *  we've got a verb yet, and so on.  Object must be here
+	 *  unless verb is "find" or "invent(ory)" (and no new verb
+	 *  yet to be analysed).  Water and oil are also funny, since
+	 *  they are never actually dropped at any location, but might
+	 *  be here inside the bottle or urn or as a feature of the
+	 *  location. */
+	if (HERE(obj))
+	    /* FALL THROUGH */;
+	else if (obj == GRATE) {
+	    if (game.loc == 1 || game.loc == 4 || game.loc == 7)
+		obj=DPRSSN;
+	    if (game.loc > 9 && game.loc < 15)
+		obj=ENTRNC;
+	    if (obj != GRATE)
+		return(8);
+	}
+	else if (obj == DWARF && ATDWRF(game.loc) > 0)
+	    /* FALL THROUGH */;
+	else if ((LIQUID() == obj && HERE(BOTTLE)) || obj == LIQLOC(game.loc))
+	    /* FALL THROUGH */;
+	else if (obj == OIL && HERE(URN) && game.prop[URN] != 0) {
+	    obj=URN;
+	    /* FALL THROUGH */;
+	}
+	else if (obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != 0) {
+	    obj=PLANT2;
+	    /* FALL THROUGH */;
+	}
+	else if (obj == KNIFE && game.knfloc == game.loc) {
+	    game.knfloc= -1;
+	    SPK=116;
+	    {RSPEAK(SPK); return 2012;}
+	}
+	else if (obj == ROD && HERE(ROD2)) {
+	    obj=ROD2;
+	    /* FALL THROUGH */;
+	}
+	else if ((verb == FIND || verb == INVENT) && WD2 <= 0)
+	    /* FALL THROUGH */;
+	else {
+	    SETPRM(1,WD1,WD1X);
+	    RSPEAK(256);
+	    return(2012);
+	}
 
-	    if (WD2 > 0)
-		return(2800);
-	    if (verb != 0)
-		part = transitive;
+	if (WD2 > 0)
+	    return(2800);
+	if (verb != 0)
+	    part = transitive;
     }
 
     switch(part)
@@ -962,13 +1054,13 @@ int action(FILE *input, enum speechpart part, long verb, long obj)
 		    case  1: /* DROP  */ return(8000); 
 		    case  2: /* SAY   */ return(8000); 
 		    case  3: /* UNLOC */ return lock(verb, INTRANSITIVE);    
-		    case  4: /* NOTHI */ return(2009); 
+		    case  4: /* NOTHI */ {RSPEAK(54); return(20012);}
 		    case  5: /* LOCK  */ return lock(verb, INTRANSITIVE);    
 		    case  6: /* LIGHT */ return light(INTRANSITIVE);    
 		    case  7: /* EXTIN */ return extinguish(INTRANSITIVE);    
 		    case  8: /* WAVE  */ return(8000); 
 		    case  9: /* CALM  */ return(8000); 
-		    case 10: /* WALK  */ return(2011); 
+		    case 10: /* WALK  */ {RSPEAK(SPK); return 2012;} 
 		    case 11: /* ATTAC */ return attack(input, verb, obj);   
 		    case 12: /* POUR  */ return pour(obj);   
 		    case 13: /* EAT   */ return eat(INTRANSITIVE);   
@@ -1003,39 +1095,40 @@ int action(FILE *input, enum speechpart part, long verb, long obj)
 		case  1: /* DROP  */ return discard(obj, false);    
 		case  2: /* SAY   */ return say();    
 		case  3: /* UNLOC */ return lock(verb, obj);    
-		case  4: /* NOTHI */ return(2009); 
+		case  4: /* NOTHI */ {RSPEAK(54); return(20012);}
 		case  5: /* LOCK  */ return lock(verb, obj);    
 		case  6: /* LIGHT */ return light(obj);    
 		case  7: /* EXTI  */ return extinguish(obj);    
 		case  8: /* WAVE  */ return wave(obj);    
-		case  9: /* CALM  */ return(2011); 
-		case 10: /* WALK  */ return(2011); 
+		case  9: /* CALM  */ {RSPEAK(SPK); return 2012;} 
+		case 10: /* WALK  */ {RSPEAK(SPK); return 2012;} 
 		case 11: /* ATTAC */ return attack(input, verb, obj);   
 		case 12: /* POUR  */ return pour(obj);   
 		case 13: /* EAT   */ return eat(obj);   
 		case 14: /* DRINK */ return drink(obj);   
 		case 15: /* RUB   */ return rub(obj);   
 		case 16: /* TOSS  */ return throw(input, verb, obj);   
-		case 17: /* QUIT  */ return(2011); 
+		case 17: /* QUIT  */ {RSPEAK(SPK); return 2012;} 
 		case 18: /* FIND  */ return find(obj);   
 		case 19: /* INVEN */ return find(obj);   
 		case 20: /* FEED  */ return feed(obj);   
 		case 21: /* FILL  */ return fill(obj);   
 		case 22: /* BLAST */ return blast();   
-		case 23: /* SCOR  */ return(2011); 
-		case 24: /* FOO   */ return(2011); 
-		case 25: /* BRIEF */ return(2011); 
+		case 23: /* SCOR  */ {RSPEAK(SPK); return 2012;} 
+		case 24: /* FOO   */ {RSPEAK(SPK); return 2012;} 
+		case 25: /* BRIEF */ {RSPEAK(SPK); return 2012;} 
 		case 26: /* READ  */ return read(input, obj);   
 		case 27: /* BREAK */ return vbreak(obj);   
 		case 28: /* WAKE  */ return wake(obj);   
-		case 29: /* SUSP  */ return(2011); 
-		case 30: /* RESU  */ return(2011); 
+		case 29: /* SUSP  */ {RSPEAK(SPK); return 2012;} 
+		case 30: /* RESU  */ {RSPEAK(SPK); return 2012;} 
 		case 31: /* FLY   */ return fly(obj);   
-		case 32: /* LISTE */ return(2011); 
+		case 32: /* LISTE */ {RSPEAK(SPK); return 2012;} 
 		case 33: /* ZZZZ  */ return reservoir();   
 	    }
 	    BUG(24);
 	case unknown:
+	    /* Unknown verb, couldn't deduce object - might need hint */
 	    SETPRM(1,WD1,WD1X);
 	    RSPEAK(255);
 	    return(2600);