Documentaion polishing.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 0dbba5f9c40a7d8547d8d268d1b02e6fd320d092..dd29c92deac960141c75ba240d82fb7aebb52750 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,16 @@
 /*
 /*

+ * There used to be a note that said this:
+ *

  * The author - Don Woods - apologises for the style of the code; it
  * is a result of running the original Fortran IV source through a
  * home-brew Fortran-to-C converter.)
  * The author - Don Woods - apologises for the style of the code; it
  * is a result of running the original Fortran IV source through a
  * home-brew Fortran-to-C converter.)

+ *
+ * Now that the code has been restructured into idiomatic C, the following
+ * is more appropriate:
+ *
+ * ESR apologizes for the remaing gotos (now confined to two functions in this
+ * file - they used to be *everywhere*), and the offensive globals.  Applying
+ * the Structured Program Theorem can be hard.

  */
 #include <stdlib.h>
 #include <stdio.h>
  */
 #include <stdlib.h>
 #include <stdio.h>


@@ -11,24 +20,26 @@
 #include <time.h>
 #include "advent.h"
 #include "database.h"
 #include <time.h>
 #include "advent.h"
 #include "database.h"

+#include "linenoise/linenoise.h"

 
 struct game_t game;
 
 long LNLENG, LNPOSN, PARMS[MAXPARMS+1];
 
 struct game_t game;
 
 long LNLENG, LNPOSN, PARMS[MAXPARMS+1];

-char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
+char rawbuf[LINESIZE], INLINE[LINESIZE+1];

 
 long AMBER, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
                CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
 
 long AMBER, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
                CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,

-               GRATE, HINT, I, INVENT, J, JADE, K, KEYS,
-               KNIFE, L, LAMP, LOCK, LOOK, MAGZIN,
+               GRATE, HINT, INVENT, JADE, KEYS,
+               KNIFE, LAMP, LOCK, LOOK, MAGZIN,

                MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
                MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,

-               RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE, SPK,
+               RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,

                STEPS, STREAM, THROW, TRIDNT, TROLL, TROLL2,
                STEPS, STREAM, THROW, TRIDNT, TROLL, TROLL2,

-               URN, VASE, VEND,
-               VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
+               URN, VASE, VEND, VOLCAN, WATER;
+long K, SPK, WD1, WD1X, WD2, WD2X;
+

 FILE  *logfp;
 bool oldstyle = false;
 lcg_state lcgstate;
 FILE  *logfp;
 bool oldstyle = false;
 lcg_state lcgstate;


@@ -67,7 +78,7 @@ int main(int argc, char *argv[])
 
     while ((ch = getopt(argc, argv, "l:o")) != EOF) {
        switch (ch) {
 
     while ((ch = getopt(argc, argv, "l:o")) != EOF) {
        switch (ch) {

-       case 'l':
+case 'l':

            logfp = fopen(optarg, "w");
            if (logfp == NULL)
                fprintf(stderr,
            logfp = fopen(optarg, "w");
            if (logfp == NULL)
                fprintf(stderr,


@@ -81,6 +92,8 @@ int main(int argc, char *argv[])
        }
     }
 
        }
     }
 

+    linenoiseHistorySetMaxLen(350);
+

     /* Logical variables:
      *
      *  game.closed says whether we're all the way closed
     /* Logical variables:
      *
      *  game.closed says whether we're all the way closed


@@ -101,7 +114,6 @@ int main(int argc, char *argv[])
     set_seed(seedval);
 
     /*  Initialize game variables */
     set_seed(seedval);
 
     /*  Initialize game variables */

-    MAP2[1] = 0;

     if (!game.setup)
        initialise();
 
     if (!game.setup)
        initialise();
 


@@ -109,7 +121,7 @@ int main(int argc, char *argv[])
      *  lets us get away with modifying things such as OBJSND(BIRD) without
      *  having to be able to undo the changes later.)  If a "used" copy is
      *  rerun, we come here and tell the player to run a fresh copy. */
      *  lets us get away with modifying things such as OBJSND(BIRD) without
      *  having to be able to undo the changes later.)  If a "used" copy is
      *  rerun, we come here and tell the player to run a fresh copy. */

-    if(game.setup <= 0) {
+    if (game.setup <= 0) {

        RSPEAK(201);
        exit(0);
     }
        RSPEAK(201);
        exit(0);
     }


@@ -121,7 +133,7 @@ int main(int argc, char *argv[])
     game.newloc=1;
     game.loc=1;
     game.limit=330;
     game.newloc=1;
     game.loc=1;
     game.limit=330;

-    if(game.novice)game.limit=1000;
+    if (game.novice)game.limit=1000;

 
     if (logfp)
        fprintf(logfp, "seed %ld\n", seedval);
 
     if (logfp)
        fprintf(logfp, "seed %ld\n", seedval);


@@ -161,21 +173,21 @@ static void dohint(FILE *cmdin, int hint)
     {
     case 0:
        /* cave */
     {
     case 0:
        /* cave */

-       if(game.prop[GRATE] == 0 && !HERE(KEYS))
+       if (game.prop[GRATE] == 0 && !HERE(KEYS))

            break;
        game.hintlc[hint]=0;
        return;
     case 1:    /* bird */
            break;
        game.hintlc[hint]=0;
        return;
     case 1:    /* bird */

-       if(game.place[BIRD] == game.loc && TOTING(ROD) && game.oldobj == BIRD)
+       if (game.place[BIRD] == game.loc && TOTING(ROD) && game.oldobj == BIRD)

            break;
        return;
     case 2:    /* snake */
            break;
        return;
     case 2:    /* snake */

-       if(HERE(SNAKE) && !HERE(BIRD))
+       if (HERE(SNAKE) && !HERE(BIRD))

            break;
        game.hintlc[hint]=0;
        return;
     case 3:    /* maze */
            break;
        game.hintlc[hint]=0;
        return;
     case 3:    /* maze */

-       if(game.atloc[game.loc] == 0 &&
+       if (game.atloc[game.loc] == 0 &&

           game.atloc[game.oldloc] == 0 &&
           game.atloc[game.oldlc2] == 0 &&
           game.holdng > 1)
           game.atloc[game.oldloc] == 0 &&
           game.atloc[game.oldlc2] == 0 &&
           game.holdng > 1)


@@ -183,34 +195,34 @@ static void dohint(FILE *cmdin, int hint)
        game.hintlc[hint]=0;
        return;
     case 4:    /* dark */
        game.hintlc[hint]=0;
        return;
     case 4:    /* dark */

-       if(game.prop[EMRALD] != -1 && game.prop[PYRAM] == -1)
+       if (game.prop[EMRALD] != -1 && game.prop[PYRAM] == -1)

            break;
        game.hintlc[hint]=0;
        return;
     case 5:    /* witt */
        break;
     case 6:    /* urn */
            break;
        game.hintlc[hint]=0;
        return;
     case 5:    /* witt */
        break;
     case 6:    /* urn */

-       if(game.dflag == 0)
+       if (game.dflag == 0)

            break;
        game.hintlc[hint]=0;
        return;
     case 7:    /* woods */
            break;
        game.hintlc[hint]=0;
        return;
     case 7:    /* woods */

-       if(game.atloc[game.loc] == 0 &&
+       if (game.atloc[game.loc] == 0 &&

                   game.atloc[game.oldloc] == 0 &&
                   game.atloc[game.oldlc2] == 0)
                break;
        return;
     case 8:    /* ogre */
        i=ATDWRF(game.loc);
                   game.atloc[game.oldloc] == 0 &&
                   game.atloc[game.oldlc2] == 0)
                break;
        return;
     case 8:    /* ogre */
        i=ATDWRF(game.loc);

-       if(i < 0) {
+       if (i < 0) {

            game.hintlc[hint]=0;
            return;
            }
            game.hintlc[hint]=0;
            return;
            }

-       if(HERE(OGRE) && i == 0)
+       if (HERE(OGRE) && i == 0)

            break;
        return;
     case 9:    /* jade */
            break;
        return;
     case 9:    /* jade */

-       if(game.tally == 1 && game.prop[JADE] < 0)
+       if (game.tally == 1 && game.prop[JADE] < 0)

            break;
        game.hintlc[hint]=0;
        return;
            break;
        game.hintlc[hint]=0;
        return;


@@ -221,12 +233,12 @@ static void dohint(FILE *cmdin, int hint)
     
     /* Fall through to hint display */
     game.hintlc[hint]=0;
     
     /* Fall through to hint display */
     game.hintlc[hint]=0;

-    if(!YES(cmdin,HINTS[hint][3],0,54))
+    if (!YES(cmdin,HINTS[hint][3],0,54))

        return;
     SETPRM(1,HINTS[hint][2],HINTS[hint][2]);
     RSPEAK(261);
     game.hinted[hint]=YES(cmdin,175,HINTS[hint][4],54);
        return;
     SETPRM(1,HINTS[hint][2],HINTS[hint][2]);
     RSPEAK(261);
     game.hinted[hint]=YES(cmdin,175,HINTS[hint][4],54);

-    if(game.hinted[hint] && game.limit > 30)
+    if (game.hinted[hint] && game.limit > 30)

        game.limit=game.limit+30*HINTS[hint][2];
 }
 
        game.limit=game.limit+30*HINTS[hint][2];
 }
 


@@ -249,12 +261,12 @@ static bool dwarfmove(void)
      *  means dwarves won't follow him into dead end in maze, but
      *  c'est la vie.  They'll wait for him outside the dead
      *  end. */
      *  means dwarves won't follow him into dead end in maze, but
      *  c'est la vie.  They'll wait for him outside the dead
      *  end. */

-    if(game.loc == 0 || FORCED(game.loc) || CNDBIT(game.newloc,3))
+    if (game.loc == 0 || FORCED(game.loc) || CNDBIT(game.newloc,3))

        return true;
 
     /* Dwarf activity level ratchets up */
        return true;
 
     /* Dwarf activity level ratchets up */

-    if(game.dflag == 0) {
-       if(INDEEP(game.loc))
+    if (game.dflag == 0) {
+       if (INDEEP(game.loc))

            game.dflag=1;
        return true;
     }
            game.dflag=1;
        return true;
     }


@@ -262,19 +274,19 @@ static bool dwarfmove(void)
     /*  When we encounter the first dwarf, we kill 0, 1, or 2 of
      *  the 5 dwarves.  If any of the survivors is at loc,
      *  replace him with the alternate. */
     /*  When we encounter the first dwarf, we kill 0, 1, or 2 of
      *  the 5 dwarves.  If any of the survivors is at loc,
      *  replace him with the alternate. */

-    if(game.dflag == 1) {
-       if(!INDEEP(game.loc) || (PCT(95) && (!CNDBIT(game.loc,4) || PCT(85))))
+    if (game.dflag == 1) {
+       if (!INDEEP(game.loc) || (PCT(95) && (!CNDBIT(game.loc,4) || PCT(85))))

            return true;
        game.dflag=2;
            return true;
        game.dflag=2;

-       for (I=1; I<=2; I++) {
-           J=1+randrange(NDWARVES-1);
-           if(PCT(50))
-               game.dloc[J]=0;
+       for (int i=1; i<=2; i++) {
+           int j=1+randrange(NDWARVES-1);
+           if (PCT(50))
+               game.dloc[j]=0;

        }
        }

-       for (I=1; I<=NDWARVES-1; I++) {
-           if(game.dloc[I] == game.loc)
-               game.dloc[I]=DALTLC;
-           game.odloc[I]=game.dloc[I];
+       for (int i=1; i<=NDWARVES-1; i++) {
+           if (game.dloc[i] == game.loc)
+               game.dloc[i]=DALTLC;
+           game.odloc[i]=game.dloc[i];

        }
        RSPEAK(3);
        DROP(AXE,game.loc);
        }
        RSPEAK(3);
        DROP(AXE,game.loc);


@@ -290,64 +302,85 @@ static bool dwarfmove(void)
     game.dtotal=0;
     attack=0;
     stick=0;
     game.dtotal=0;
     attack=0;
     stick=0;

-    for (I=1; I<=NDWARVES; I++) {
-       if(game.dloc[I] == 0)
+    for (int i=1; i<=NDWARVES; i++) {
+       int k;
+       if (game.dloc[i] == 0)

            continue;
        /*  Fill TK array with all the places this dwarf might go. */
            continue;
        /*  Fill TK array with all the places this dwarf might go. */

-       J=1;
-       kk=KEY[game.dloc[I]];
-       if(kk != 0)
+       int j=1;
+       kk=KEY[game.dloc[i]];
+       if (kk != 0)

            do {
                game.newloc=MOD(labs(TRAVEL[kk])/1000,1000);
                /* Have we avoided a dwarf enciounter? */
                bool avoided = (game.newloc > 300 ||
                                !INDEEP(game.newloc) ||
            do {
                game.newloc=MOD(labs(TRAVEL[kk])/1000,1000);
                /* Have we avoided a dwarf enciounter? */
                bool avoided = (game.newloc > 300 ||
                                !INDEEP(game.newloc) ||

-                               game.newloc == game.odloc[I] ||
-                               (J > 1 && game.newloc == TK[J-1]) ||
-                               J >= 20 ||
-                               game.newloc == game.dloc[I] ||
+                               game.newloc == game.odloc[i] ||
+                               (j > 1 && game.newloc == TK[j-1]) ||
+                               j >= 20 ||
+                               game.newloc == game.dloc[i] ||

                                FORCED(game.newloc) ||
                                FORCED(game.newloc) ||

-                               (I == PIRATE && CNDBIT(game.newloc,3)) ||
+                               (i == PIRATE && CNDBIT(game.newloc,3)) ||

                                labs(TRAVEL[kk])/1000000 == 100);
                if (!avoided) {
                                labs(TRAVEL[kk])/1000000 == 100);
                if (!avoided) {

-                   TK[J++] = game.newloc;
+                   TK[j++] = game.newloc;

                }
                ++kk;
            } while
                (TRAVEL[kk-1] >= 0);
                }
                ++kk;
            } while
                (TRAVEL[kk-1] >= 0);

-       TK[J]=game.odloc[I];
-       if(J >= 2)
-           --J;
-       J=1+randrange(J);
-       game.odloc[I]=game.dloc[I];
-       game.dloc[I]=TK[J];
-       game.dseen[I]=(game.dseen[I] && INDEEP(game.loc)) || (game.dloc[I] == game.loc || game.odloc[I] == game.loc);
-       if(!game.dseen[I]) continue;
-       game.dloc[I]=game.loc;
-       if(I == PIRATE) {
+       TK[j]=game.odloc[i];
+       if (j >= 2)
+           --j;
+       j=1+randrange(j);
+       game.odloc[i]=game.dloc[i];
+       game.dloc[i]=TK[j];
+       game.dseen[i]=(game.dseen[i] && INDEEP(game.loc)) || (game.dloc[i] == game.loc || game.odloc[i] == game.loc);
+       if (!game.dseen[i]) continue;
+       game.dloc[i]=game.loc;
+       if (i == PIRATE) {

            /*  The pirate's spotted him.  He leaves him alone once we've
             *  found chest.  K counts if a treasure is here.  If not, and
             *  tally=1 for an unseen chest, let the pirate be spotted.
             *  Note that game.place(CHEST)=0 might mean that he's thrown
             *  it to the troll, but in that case he's seen the chest
             *  (game.prop=0). */
            /*  The pirate's spotted him.  He leaves him alone once we've
             *  found chest.  K counts if a treasure is here.  If not, and
             *  tally=1 for an unseen chest, let the pirate be spotted.
             *  Note that game.place(CHEST)=0 might mean that he's thrown
             *  it to the troll, but in that case he's seen the chest
             *  (game.prop=0). */

-           if(game.loc == game.chloc || game.prop[CHEST] >= 0)
+           if (game.loc == game.chloc || game.prop[CHEST] >= 0)

                continue;
                continue;

-           K=0;
-           for (J=MINTRS; J<=MAXTRS; J++) {
-               /*  Pirate won't take pyramid from plover room or dark
-               *  room (too easy!). */
-               if(J == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD]))
-                   goto L6020;
-               if(TOTING(J)) {
-                   goto L6021;
+           k=0;
+           for (int j=MINTRS; j<=MAXTRS; j++) {
+               /*  Pirate won't take pyramid from plover room or dark
+                *  room (too easy!). */
+               if (j == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD])) {
+                   if (HERE(j))
+                       k=1;
+                   continue;
+               }
+               if (TOTING(j)) {
+                   if (game.place[CHEST] == 0) {
+                       /*  Install chest only once, to insure it is
+                        *  the last treasure in the list. */
+                       MOVE(CHEST,game.chloc);
+                       MOVE(MESSAG,game.chloc2);
+                   }
+                   RSPEAK(128);
+                   for (int j=MINTRS; j<=MAXTRS; j++) {
+                       if (!(j == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD]))) {
+                           if (AT(j) && game.fixed[j] == 0)
+                               CARRY(j,game.loc);
+                           if (TOTING(j))
+                               DROP(j,game.chloc);
+                       }
+                   }
+                   game.dloc[PIRATE]=game.chloc;
+                   game.odloc[PIRATE]=game.chloc;
+                   game.dseen[PIRATE]=false;
+                   goto jumpout;

                }
                }

-           L6020:
-               if(HERE(J))
-                   K=1;
+               if (HERE(j))
+                   k=1;

            }
            /* Force chest placement before player finds last treasure */
            }
            /* Force chest placement before player finds last treasure */

-           if(game.tally == 1 && K == 0 && game.place[CHEST] == 0 && HERE(LAMP) && game.prop[LAMP] == 1) {
+           if (game.tally == 1 && k == 0 && game.place[CHEST] == 0 && HERE(LAMP) && game.prop[LAMP] == 1) {

                RSPEAK(186);
                MOVE(CHEST,game.chloc);
                MOVE(MESSAG,game.chloc2);
                RSPEAK(186);
                MOVE(CHEST,game.chloc);
                MOVE(MESSAG,game.chloc2);


@@ -356,69 +389,69 @@ static bool dwarfmove(void)
                game.dseen[PIRATE]=false;
                continue;
            }
                game.dseen[PIRATE]=false;
                continue;
            }

-           if(game.odloc[PIRATE] != game.dloc[PIRATE] && PCT(20))
+           if (game.odloc[PIRATE] != game.dloc[PIRATE] && PCT(20))

                RSPEAK(127);
            continue;
                RSPEAK(127);
            continue;

-
-       L6021:
-           if(game.place[CHEST] == 0) {
-               /*  Install chest only once, to insure it is the last treasure in
-                *  the list. */
-               MOVE(CHEST,game.chloc);
-               MOVE(MESSAG,game.chloc2);
-           }
-           RSPEAK(128);
-           for (J=MINTRS; J<=MAXTRS; J++) {
-               if (!(J == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD]))) {
-                   if(AT(J) && game.fixed[J] == 0)
-                       CARRY(J,game.loc);
-                   if(TOTING(J))
-                       DROP(J,game.chloc);
-               }
-           }
-           game.dloc[PIRATE]=game.chloc;
-           game.odloc[PIRATE]=game.chloc;
-           game.dseen[PIRATE]=false;
-           continue;

        }
 
        /* This threatening little dwarf is in the room with him! */
        ++game.dtotal;
        }
 
        /* This threatening little dwarf is in the room with him! */
        ++game.dtotal;

-       if(game.odloc[I] == game.dloc[I]) {
+       if (game.odloc[i] == game.dloc[i]) {

            ++attack;
            ++attack;

-           if(game.knfloc >= 0)
+           if (game.knfloc >= 0)

                game.knfloc=game.loc;
                game.knfloc=game.loc;

-           if(randrange(1000) < 95*(game.dflag-2))
+           if (randrange(1000) < 95*(game.dflag-2))

                ++stick;
        }
                ++stick;
        }

+    jumpout:;

     }
 
     /*  Now we know what's happening.  Let's tell the poor sucker about it.
      *  Note that various of the "knife" messages must have specific relative
      *  positions in the RSPEAK database. */
     }
 
     /*  Now we know what's happening.  Let's tell the poor sucker about it.
      *  Note that various of the "knife" messages must have specific relative
      *  positions in the RSPEAK database. */

-    if(game.dtotal == 0)
+    if (game.dtotal == 0)

        return true;
     SETPRM(1,game.dtotal,0);
     RSPEAK(4+1/game.dtotal);
        return true;
     SETPRM(1,game.dtotal,0);
     RSPEAK(4+1/game.dtotal);

-    if(attack == 0)
+    if (attack == 0)

        return true;
        return true;

-    if(game.dflag == 2)game.dflag=3;
+    if (game.dflag == 2)game.dflag=3;

     SETPRM(1,attack,0);
     K=6;
     SETPRM(1,attack,0);
     K=6;

-    if(attack > 1)K=250;
+    if (attack > 1)K=250;

     RSPEAK(K);
     SETPRM(1,stick,0);
     RSPEAK(K+1+2/(1+stick));
     RSPEAK(K);
     SETPRM(1,stick,0);
     RSPEAK(K+1+2/(1+stick));

-    if(stick == 0)
+    if (stick == 0)

        return true;
     game.oldlc2=game.loc;
     return false;
 }
 
        return true;
     game.oldlc2=game.loc;
     return false;
 }
 

+/*  "You're dead, Jim."
+ *
+ *  If the current loc is zero, it means the clown got himself killed.
+ *  We'll allow this maxdie times.  MAXDIE is automatically set based
+ *  on the number of snide messages available.  Each death results in
+ *  a message (81, 83, etc.)  which offers reincarnation; if accepted,
+ *  this results in message 82, 84, etc.  The last time, if he wants
+ *  another chance, he gets a snide remark as we exit.  When
+ *  reincarnated, all objects being carried get dropped at game.oldlc2
+ *  (presumably the last place prior to being killed) without change
+ *  of props.  the loop runs backwards to assure that the bird is
+ *  dropped before the cage.  (this kluge could be changed once we're
+ *  sure all references to bird and cage are done by keywords.)  The
+ *  lamp is a special case (it wouldn't do to leave it in the cave).
+ *  It is turned off and left outside the building (only if he was
+ *  carrying it, of course).  He himself is left inside the building
+ *  (and heaven help him if he tries to xyzzy back into the cave
+ *  without the lamp!).  game.oldloc is zapped so he can't just
+ *  "retreat". */
+

 static void croak(FILE *cmdin)
 /*  Okay, he's dead.  Let's get on with it. */
 {
 static void croak(FILE *cmdin)
 /*  Okay, he's dead.  Let's get on with it. */
 {

-    if(game.closng) {
+    if (game.closng) {

        /*  He died during closing time.  No resurrection.  Tally up a
         *  death and exit. */
        RSPEAK(131);
        /*  He died during closing time.  No resurrection.  Tally up a
         *  death and exit. */
        RSPEAK(131);


@@ -426,21 +459,21 @@ static void croak(FILE *cmdin)
        score(0);
     } else {
        ++game.numdie;
        score(0);
     } else {
        ++game.numdie;

-       if(!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54))
+       if (!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54))

            score(0);
            score(0);

-       if(game.numdie == MAXDIE)
+       if (game.numdie == MAXDIE)

            score(0);
        game.place[WATER]=0;
        game.place[OIL]=0;
            score(0);
        game.place[WATER]=0;
        game.place[OIL]=0;

-       if(TOTING(LAMP))
+       if (TOTING(LAMP))

            game.prop[LAMP]=0;
            game.prop[LAMP]=0;

-       for (J=1; J<=NOBJECTS; J++) {
-           I=NOBJECTS + 1 - J;
-           if(TOTING(I)) {
-               K=game.oldlc2;
-               if(I == LAMP)
-                   K=1;
-               DROP(I,K);
+       for (int j=1; j<=NOBJECTS; j++) {
+           int i=NOBJECTS + 1 - j;
+           if (TOTING(i)) {
+               int k=game.oldlc2;
+               if (i == LAMP)
+                   k=1;
+               DROP(i,k);

            }
        }
        game.loc=3;
            }
        }
        game.loc=3;


@@ -448,16 +481,204 @@ static void croak(FILE *cmdin)
     }
 }
 
     }
 }
 

-static bool do_command(FILE *cmdin) {
-       long LL, KQ, VERB, KK, K2, V1, V2;
+/*  Given the current location in "game.loc", and a motion verb number in
+ *  "K", put the new location in "game.newloc".  The current loc is saved
+ *  in "game.oldloc" in case he wants to retreat.  The current
+ *  game.oldloc is saved in game.oldlc2, in case he dies.  (if he
+ *  does, game.newloc will be limbo, and game.oldloc will be what killed
+ *  him, so we need game.oldlc2, which is the last place he was
+ *  safe.) */
+
+static bool playermove(FILE *cmdin, token_t verb)
+{
+    int LL, K2, KK=KEY[game.loc];
+    game.newloc=game.loc;
+    if (KK == 0)
+       BUG(26);
+    if (K == NUL)
+       return true;
+    else if (K == BACK) {
+       /*  Handle "go back".  Look for verb which goes from game.loc to
+        *  game.oldloc, or to game.oldlc2 If game.oldloc has forced-motion.
+        *  K2 saves entry -> forced loc -> previous loc. */
+       K=game.oldloc;
+       if (FORCED(K))
+           K=game.oldlc2;
+       game.oldlc2=game.oldloc;
+       game.oldloc=game.loc;
+       K2=0;
+       if (K == game.loc)K2=91;
+       if (CNDBIT(game.loc,4))K2=274;
+       if (K2 == 0) {
+       L21:
+           LL=MOD((labs(TRAVEL[KK])/1000),1000);
+           if (LL != K) {
+               if (LL <= 300) {
+                   if (FORCED(LL) && MOD((labs(TRAVEL[KEY[LL]])/1000),1000) == K)
+                       K2=KK;
+               }
+               if (TRAVEL[KK] >= 0) {
+                   ++KK;
+                   goto L21;
+               }
+               KK=K2;
+               if (KK == 0) {
+                   RSPEAK(140);
+                   return true;
+               }
+           }
+
+           K=MOD(labs(TRAVEL[KK]),1000);
+           KK=KEY[game.loc];
+           goto L9;
+       } else {
+           RSPEAK(K2);
+           return true;
+       }
+    }
+    else if (K == LOOK) {
+       /*  Look.  Can't give more detail.  Pretend it wasn't dark
+        *  (though it may "now" be dark) so he won't fall into a
+        *  pit while staring into the gloom. */
+       if (game.detail < 3)RSPEAK(15);
+       ++game.detail;
+       game.wzdark=false;
+       game.abbrev[game.loc]=0;
+       return true;
+    }
+    else if (K == CAVE) {
+       /*  Cave.  Different messages depending on whether above ground. */
+       RSPEAK((OUTSID(game.loc) && game.loc != 8) ? 57 : 58);
+       return true;
+    }
+    game.oldlc2=game.oldloc;
+    game.oldloc=game.loc;
+
+L9:
+    for (;;) {
+       LL=labs(TRAVEL[KK]);
+       if (MOD(LL,1000) == 1 || MOD(LL,1000) == K)
+           break;
+       if (TRAVEL[KK] < 0) {
+           /*  Non-applicable motion.  Various messages depending on
+            *  word given. */
+           SPK=12;
+           if (K >= 43 && K <= 50)SPK=52;
+           if (K == 29 || K == 30)SPK=52;
+           if (K == 7 || K == 36 || K == 37)SPK=10;
+           if (K == 11 || K == 19)SPK=11;
+           if (verb == FIND || verb == INVENT)SPK=59;
+           if (K == 62 || K == 65)SPK=42;
+           if (K == 17)SPK=80;
+           RSPEAK(SPK);
+           return true;
+       }
+       ++KK;
+    }
+    LL=LL/1000;
+
+L11:
+    game.newloc=LL/1000;
+    K=MOD(game.newloc,100);
+    if (game.newloc <= 300) {
+       if (game.newloc <= 100)
+           goto L14;
+       if (TOTING(K) || (game.newloc > 200 && AT(K)))
+           goto L16;
+       goto L12;
+    }
+    if (game.prop[K] != game.newloc/100-3)
+       goto L16;
+L12:
+    do {
+       if (TRAVEL[KK] < 0)BUG(25);
+       ++KK;
+       game.newloc=labs(TRAVEL[KK])/1000;
+    } while
+        (game.newloc == LL);
+    LL=game.newloc;
+    goto L11;
+
+L14:
+    if (game.newloc != 0 && !PCT(game.newloc))
+       goto L12;
+L16:
+    game.newloc=MOD(LL,1000);
+    if (game.newloc <= 300) return true;
+    if (game.newloc <= 500) {
+       game.newloc=game.newloc-300;
+       switch (game.newloc)
+       {
+       case 1:
+           /*  Travel 301.  Plover-alcove passage.  Can carry only
+            *  emerald.  Note: travel table must include "useless"
+            *  entries going through passage, which can never be used for
+            *  actual motion, but can be spotted by "go back". */
+           game.newloc=99+100-game.loc;
+           if (game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD)))
+               return true;
+           game.newloc=game.loc;
+           RSPEAK(117);
+           return true;
+       case 2:
+           /*  Travel 302.  Plover transport.  Drop the emerald (only use
+            *  special travel if toting it), so he's forced to use the
+            *  plover-passage to get it out.  Having dropped it, go back and
+            *  pretend he wasn't carrying it after all. */
+           DROP(EMRALD,game.loc);
+           goto L12;
+       case 3:
+           /*  Travel 303.  Troll bridge.  Must be done only as special
+            *  motion so that dwarves won't wander across and encounter
+            *  the bear.  (They won't follow the player there because
+            *  that region is forbidden to the pirate.)  If
+            *  game.prop(TROLL)=1, he's crossed since paying, so step out
+            *  and block him.  (standard travel entries check for
+            *  game.prop(TROLL)=0.)  Special stuff for bear. */
+           if (game.prop[TROLL] == 1) {
+               PSPEAK(TROLL,1);
+               game.prop[TROLL]=0;
+               MOVE(TROLL2,0);
+               MOVE(TROLL2+NOBJECTS,0);
+               MOVE(TROLL,PLAC[TROLL]);
+               MOVE(TROLL+NOBJECTS,FIXD[TROLL]);
+               JUGGLE(CHASM);
+               game.newloc=game.loc;
+               return true;
+           } else {
+               game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc;
+               if (game.prop[TROLL] == 0)game.prop[TROLL]=1;
+               if (!TOTING(BEAR)) return true;
+               RSPEAK(162);
+               game.prop[CHASM]=1;
+               game.prop[TROLL]=2;
+               DROP(BEAR,game.newloc);
+               game.fixed[BEAR]= -1;
+               game.prop[BEAR]=3;
+               game.oldlc2=game.newloc;
+               croak(cmdin);
+               return false;
+           }
+       }
+       BUG(20);
+    }
+    RSPEAK(game.newloc-500);
+    game.newloc=game.loc;
+    return true;
+}
+
+static bool do_command(FILE *cmdin)
+{
+       long KQ, VERB, KK, V1, V2;

        long obj, i;
        static long IGO = 0;
        long obj, i;
        static long IGO = 0;

+       enum speechpart part;

 
        /*  Can't leave cave once it's closing (except by main office). */
 
        /*  Can't leave cave once it's closing (except by main office). */

-       if(OUTSID(game.newloc) && game.newloc != 0 && game.closng) {
+       if (OUTSID(game.newloc) && game.newloc != 0 && game.closng) {

            RSPEAK(130);
            game.newloc=game.loc;
            RSPEAK(130);
            game.newloc=game.loc;

-           if(!game.panic)game.clock2=15;
+           if (!game.panic)game.clock2=15;

            game.panic=true;
        }
 
            game.panic=true;
        }
 


@@ -465,9 +686,9 @@ static bool do_command(FILE *cmdin) {
         *  wants to go.  If so, the dwarf's blocking his way.  If
         *  coming from place forbidden to pirate (dwarves rooted in
         *  place) let him get out (and attacked). */
         *  wants to go.  If so, the dwarf's blocking his way.  If
         *  coming from place forbidden to pirate (dwarves rooted in
         *  place) let him get out (and attacked). */

-       if(game.newloc != game.loc && !FORCED(game.loc) && !CNDBIT(game.loc,3)) {
+       if (game.newloc != game.loc && !FORCED(game.loc) && !CNDBIT(game.loc,3)) {

                for (i=1; i<=NDWARVES-1; i++) {
                for (i=1; i<=NDWARVES-1; i++) {

-                   if(game.odloc[i] == game.newloc && game.dseen[i]) {
+                   if (game.odloc[i] == game.newloc && game.dseen[i]) {

                        game.newloc=game.loc;
                        RSPEAK(2);
                        break;
                        game.newloc=game.loc;
                        RSPEAK(2);
                        break;


@@ -479,41 +700,53 @@ static bool do_command(FILE *cmdin) {
        if (!dwarfmove())
            croak(cmdin);
 
        if (!dwarfmove())
            croak(cmdin);
 

-/*  Describe the current location and (maybe) get next command. */
+       /*  Describe the current location and (maybe) get next command. */

 
 

-/*  Print text for current loc. */
+       /*  Print text for current loc. */

 
 

-L2000: if(game.loc == 0)
+L2000: if (game.loc == 0)

            croak(cmdin);
        KK=STEXT[game.loc];
            croak(cmdin);
        KK=STEXT[game.loc];

-       if(MOD(game.abbrev[game.loc],game.abbnum) == 0 || KK == 0)KK=LTEXT[game.loc];
-       if(FORCED(game.loc) || !DARK(0)) goto L2001;
-       if(game.wzdark && PCT(35)) goto L90;
-       KK=RTEXT[16];
-L2001: if(TOTING(BEAR))RSPEAK(141);
+       if (MOD(game.abbrev[game.loc],game.abbnum) == 0 || KK == 0)
+           KK=LTEXT[game.loc];
+       if (!FORCED(game.loc) && DARK(0)) {
+           /*  The easiest way to get killed is to fall into a pit in
+            *  pitch darkness. */
+           if (game.wzdark && PCT(35)) {
+               RSPEAK(23);
+               game.oldlc2 = game.loc;
+               croak(cmdin);
+               goto L2000;
+           }
+           KK=RTEXT[16];
+       }
+       if (TOTING(BEAR))RSPEAK(141);

        SPEAK(KK);
        K=1;
        SPEAK(KK);
        K=1;

-       if(FORCED(game.loc)) goto L8;
-       if(game.loc == 33 && PCT(25) && !game.closng)RSPEAK(7);
-
-/*  Print out descriptions of objects at this location.  If not closing and
- *  property value is negative, tally off another treasure.  Rug is special
- *  case; once seen, its game.prop is 1 (dragon on it) till dragon is killed.
- *  Similarly for chain; game.prop is initially 1 (locked to bear).  These hacks
- *  are because game.prop=0 is needed to get full score. */
-
-       if(DARK(0)) goto L2012;
-       game.abbrev[game.loc]=game.abbrev[game.loc]+1;
-       I=game.atloc[game.loc];
-L2004: if(I == 0) goto L2012;
-       obj=I;
-       if(obj > NOBJECTS)obj=obj-NOBJECTS;
-       if(obj == STEPS && TOTING(NUGGET)) goto L2008;
-       if(game.prop[obj] >= 0) goto L2006;
-       if(game.closed) goto L2008;
+       if (FORCED(game.loc))
+           goto L8;
+       if (game.loc == 33 && PCT(25) && !game.closng)RSPEAK(7);
+
+       /*  Print out descriptions of objects at this location.  If
+        *  not closing and property value is negative, tally off
+        *  another treasure.  Rug is special case; once seen, its
+        *  game.prop is 1 (dragon on it) till dragon is killed.
+        *  Similarly for chain; game.prop is initially 1 (locked to
+        *  bear).  These hacks are because game.prop=0 is needed to
+        *  get full score. */
+
+       if (DARK(0)) goto L2012;
+       ++game.abbrev[game.loc];
+       i=game.atloc[game.loc];
+L2004: if (i == 0) goto L2012;
+       obj=i;
+       if (obj > NOBJECTS)obj=obj-NOBJECTS;
+       if (obj == STEPS && TOTING(NUGGET)) goto L2008;
+       if (game.prop[obj] >= 0) goto L2006;
+       if (game.closed) goto L2008;

        game.prop[obj]=0;
        game.prop[obj]=0;

-       if(obj == RUG || obj == CHAIN)game.prop[obj]=1;
-       game.tally=game.tally-1;
+       if (obj == RUG || obj == CHAIN)game.prop[obj]=1;
+       --game.tally;

 /*  Note: There used to be a test here to see whether the player had blown it
  *  so badly that he could never ever see the remaining treasures, and if so
  *  the lamp was zapped to 35 turns.  But the tests were too simple-minded;
 /*  Note: There used to be a test here to see whether the player had blown it
  *  so badly that he could never ever see the remaining treasures, and if so
  *  the lamp was zapped to 35 turns.  But the tests were too simple-minded;


@@ -526,9 +759,9 @@ L2004:      if(I == 0) goto L2012;
  *  anyone who makes such a gross blunder isn't likely to find everything
  *  else anyway (so goes the rationalisation). */
 L2006: KK=game.prop[obj];
  *  anyone who makes such a gross blunder isn't likely to find everything
  *  else anyway (so goes the rationalisation). */
 L2006: KK=game.prop[obj];

-       if(obj == STEPS && game.loc == game.fixed[STEPS])KK=1;
+       if (obj == STEPS && game.loc == game.fixed[STEPS])KK=1;

        PSPEAK(obj,KK);
        PSPEAK(obj,KK);

-L2008: I=game.link[I];
+L2008: i=game.link[i];

         goto L2004;
 
 L2009: K=54;
         goto L2004;
 
 L2009: K=54;


@@ -543,14 +776,14 @@ L2012:    VERB=0;
  *  branch to help section (on later page).  Hints all come back here eventually
  *  to finish the loop.  Ignore "HINTS" < 4 (special stuff, see database notes).
  */
  *  branch to help section (on later page).  Hints all come back here eventually
  *  to finish the loop.  Ignore "HINTS" < 4 (special stuff, see database notes).
  */

-L2600: if(COND[game.loc] >= game.conds) {
+L2600: if (COND[game.loc] >= game.conds) {

            for (int hint=1; hint<=HNTMAX; hint++) {
            for (int hint=1; hint<=HNTMAX; hint++) {

-               if(game.hinted[hint])
+               if (game.hinted[hint])

                    continue;
                    continue;

-               if(!CNDBIT(game.loc,hint+10))
+               if (!CNDBIT(game.loc,hint+10))

                    game.hintlc[hint]= -1;
                    game.hintlc[hint]= -1;

-               game.hintlc[hint] = game.hintlc[hint]+1;
-               if(game.hintlc[hint] >= HINTS[hint][1]) 
+               ++game.hintlc[hint];
+               if (game.hintlc[hint] >= HINTS[hint][1]) 

                    dohint(cmdin, hint);
            }
        }
                    dohint(cmdin, hint);
            }
        }


@@ -560,84 +793,90 @@ L2600:    if(COND[game.loc] >= game.conds) {
         *  objects won't be described until they've been picked up
         *  and put down separate from their respective piles.  Don't
         *  tick game.clock1 unless well into cave (and not at Y2). */
         *  objects won't be described until they've been picked up
         *  and put down separate from their respective piles.  Don't
         *  tick game.clock1 unless well into cave (and not at Y2). */

-L2603: if(game.closed) {
-           if(game.prop[OYSTER] < 0 && TOTING(OYSTER))
+L2603: if (game.closed) {
+           if (game.prop[OYSTER] < 0 && TOTING(OYSTER))

                PSPEAK(OYSTER,1);
            for (i=1; i<=NOBJECTS; i++) {
                PSPEAK(OYSTER,1);
            for (i=1; i<=NOBJECTS; i++) {

-               if(TOTING(i) && game.prop[i] < 0)
+               if (TOTING(i) && game.prop[i] < 0)

                    game.prop[i] = -1-game.prop[i];
            }
        }
        game.wzdark=DARK(0);
                    game.prop[i] = -1-game.prop[i];
            }
        }
        game.wzdark=DARK(0);

-       if(game.knfloc > 0 && game.knfloc != game.loc)
+       if (game.knfloc > 0 && game.knfloc != game.loc)

            game.knfloc=0;
 
        /* This is where we get a new command from the user */
            game.knfloc=0;
 
        /* This is where we get a new command from the user */

-       if (!GETIN(cmdin, WD1,WD1X,WD2,WD2X))
+       if (!GETIN(cmdin, &WD1,&WD1X,&WD2,&WD2X))

            return false;
 
        /*  Every input, check "game.foobar" flag.  If zero, nothing's
         *  going on.  If pos, make neg.  If neg, he skipped a word,
         *  so make it zero. */
 L2607: game.foobar=(game.foobar>0 ? -game.foobar : 0);
            return false;
 
        /*  Every input, check "game.foobar" flag.  If zero, nothing's
         *  going on.  If pos, make neg.  If neg, he skipped a word,
         *  so make it zero. */
 L2607: game.foobar=(game.foobar>0 ? -game.foobar : 0);

-       game.turns=game.turns+1;
-       if(game.turns == game.thresh) {
+       ++game.turns;
+       if (game.turns == game.thresh) {

        SPEAK(TTEXT[game.trndex]);
        game.trnluz=game.trnluz+TRNVAL[game.trndex]/100000;
        SPEAK(TTEXT[game.trndex]);
        game.trnluz=game.trnluz+TRNVAL[game.trndex]/100000;

-       game.trndex=game.trndex+1;
-       game.thresh= -1;
-       if(game.trndex <= TRNVLS)
+       ++game.trndex;
+       game.thresh = -1;
+       if (game.trndex <= TRNVLS)

            game.thresh=MOD(TRNVAL[game.trndex],100000)+1;
        }
            game.thresh=MOD(TRNVAL[game.trndex],100000)+1;
        }

-       if(VERB == SAY && WD2 > 0)VERB=0;
-       if(VERB == SAY) goto L4090;
-       if(game.tally == 0 && INDEEP(game.loc) && game.loc != 33)game.clock1=game.clock1-1;
-       if(game.clock1 == 0) goto L10000;
-       if(game.clock1 < 0)game.clock2=game.clock2-1;
-       if(game.clock2 == 0) goto L11000;
-       if(game.prop[LAMP] == 1)game.limit=game.limit-1;
-       if(game.limit <= 30 && HERE(BATTER) && game.prop[BATTER] == 0 && HERE(LAMP)) goto
-               L12000;
-       if(game.limit == 0) goto L12400;
-       if(game.limit <= 30) goto L12200;
+       if (VERB == SAY && WD2 > 0)VERB=0;
+       if (VERB == SAY) goto L4090;
+       if (game.tally == 0 && INDEEP(game.loc) && game.loc != 33)
+           --game.clock1;
+       if (game.clock1 == 0) goto L10000;
+       if (game.clock1 < 0)
+           --game.clock2;
+       if (game.clock2 == 0) goto L11000;
+       if (game.prop[LAMP] == 1)
+           --game.limit;
+       if (game.limit <= 30 && HERE(BATTER) && game.prop[BATTER] == 0 && HERE(LAMP))
+           goto L12000;
+       if (game.limit == 0) goto L12400;
+       if (game.limit <= 30) goto L12200;

 L19999: K=43;
 L19999: K=43;

-       if(LIQLOC(game.loc) == WATER)K=70;
+       if (LIQLOC(game.loc) == WATER)K=70;

        V1=VOCAB(WD1,-1);
        V2=VOCAB(WD2,-1);
        V1=VOCAB(WD1,-1);
        V2=VOCAB(WD2,-1);

-       if(V1 == ENTER && (V2 == STREAM || V2 == 1000+WATER)) goto L2010;
-       if(V1 == ENTER && WD2 > 0) goto L2800;
-       if((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 !=
+       if (V1 == ENTER && (V2 == STREAM || V2 == 1000+WATER)) goto L2010;
+       if (V1 == ENTER && WD2 > 0) goto L2800;
+       if ((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 !=

                1000+DOOR)) goto L2610;
                1000+DOOR)) goto L2610;

-       {long x = V2-1000; if(AT(x))WD2=MAKEWD(16152118);}
-L2610: if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && HERE(BIRD))
+       {long x = V2-1000; if (AT(x))WD2=MAKEWD(16152118);}
+L2610: if (V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && HERE(BIRD))

                WD1=MAKEWD(301200308);
                WD1=MAKEWD(301200308);

-L2620: if(WD1 == MAKEWD(23051920)) {
-               game.iwest=game.iwest+1;
-               if(game.iwest == 10)RSPEAK(17);
+L2620: if (WD1 == MAKEWD(23051920)) {
+           ++game.iwest;
+           if (game.iwest == 10)RSPEAK(17);

        }
        }

-       if(WD1 == MAKEWD( 715) && WD2 != 0) {
-           if(++IGO == 10)
+       if (WD1 == MAKEWD( 715) && WD2 != 0) {
+           if (++IGO == 10)

                RSPEAK(276);
        }
 L2630:
                RSPEAK(276);
        }
 L2630:

-       I=VOCAB(WD1,-1);
-       if(I == -1)
+       i=VOCAB(WD1,-1);
+       if (i == -1)

           goto L3000;
           goto L3000;

-       K=MOD(I,1000);
-       KQ=I/1000+1;
-        switch (KQ-1) { case 0: goto L8; case 1: goto L5000; case 2: goto L4000;
-               case 3: goto L2010; }
+       K=MOD(i,1000);
+       KQ=i/1000+1;
+       switch (KQ-1)
+       {
+       case 0: goto L8;
+       case 1: goto L5000;
+       case 2: goto L4000;
+       case 3: goto L2010;
+       }

        BUG(22);
 
        BUG(22);
 

-/*  Get second word for analysis. */
-
+       /* Get second word for analysis. */

 L2800: WD1=WD2;
        WD1X=WD2X;
        WD2=0;
 L2800: WD1=WD2;
        WD1X=WD2X;
        WD2=0;

-        goto L2620;
-
-/*  Gee, I don't understand. */
+       goto L2620;

 
 

+        /* Gee, I don't understand. */

 L3000: SETPRM(1,WD1,WD1X);
         if (fallback_handler(rawbuf))
             return true;
 L3000: SETPRM(1,WD1,WD1X);
         if (fallback_handler(rawbuf))
             return true;


@@ -646,11 +885,11 @@ L3000:    SETPRM(1,WD1,WD1X);
 
 /* Verb and object analysis moved to separate module. */
 
 
 /* Verb and object analysis moved to separate module. */
 

-L4000: I=4000; VERB=K; goto Laction;
-L4090: I=4090; goto Laction;
-L5000: I=5000; obj = K;
+L4000: part=intransitive; VERB=K; goto Laction;
+L4090: part=transitive; goto Laction;
+L5000: part=unknown; obj = K;

 Laction:
 Laction:

-        switch (action(cmdin, I, VERB, obj)) {
+        switch (action(cmdin, part, VERB, obj)) {

           case 2: return true;
           case 8: goto L8;
           case 2000: goto L2000;
           case 2: return true;
           case 8: goto L8;
           case 2000: goto L2000;


@@ -668,214 +907,22 @@ Laction:
           }
        BUG(99);
 
           }
        BUG(99);
 

-/*  Random intransitive verbs come here.  Clear obj just in case (see "attack").
-               */
-
+       /*  Random intransitive verbs come here.  Clear obj just in case
+        *  (see attack()). */

 L8000: SETPRM(1,WD1,WD1X);
        RSPEAK(257);
        obj=0;
        goto L2600;
 
 L8000: SETPRM(1,WD1,WD1X);
        RSPEAK(257);
        obj=0;
        goto L2600;
 

-/*  Figure out the new location
- *
- *  Given the current location in "game.loc", and a motion verb number in
- *  "K", put the new location in "game.newloc".  The current loc is saved
- *  in "game.oldloc" in case he wants to retreat.  The current
- *  game.oldloc is saved in game.oldlc2, in case he dies.  (if he
- *  does, game.newloc will be limbo, and OLgame.dloc will be what killed
- *  him, so we need game.oldlc2, which is the last place he was
- *  safe.) */

 
 

-L8:    KK=KEY[game.loc];
-       game.newloc=game.loc;
-       if(KK == 0)
-           BUG(26);
-       if(K == NUL)
+       /*  Figure out the new location */
+L8:    if (playermove(cmdin, VERB))

            return true;
            return true;

-       if(K == BACK) {
-           /*  Handle "go back".  Look for verb which goes from game.loc to
-            *  game.oldloc, or to game.oldlc2 If game.oldloc has forced-motion.
-            *  K2 saves entry -> forced loc -> previous loc. */
-           K=game.oldloc;
-           if(FORCED(K))K=game.oldlc2;
-           game.oldlc2=game.oldloc;
-           game.oldloc=game.loc;
-           K2=0;
-           if(K == game.loc)K2=91;
-           if(CNDBIT(game.loc,4))K2=274;
-           if(K2 == 0) goto L21;
-           RSPEAK(K2);
-           return true;
-       }
-       if(K == LOOK) {
-           /*  Look.  Can't give more detail.  Pretend it wasn't dark
-            *  (though it may "now" be dark) so he won't fall into a
-            *  pit while staring into the gloom. */
-           if(game.detail < 3)RSPEAK(15);
-           game.detail=game.detail+1;
-           game.wzdark=false;
-           game.abbrev[game.loc]=0;
-           return true;
-       }
-       if(K == CAVE) {
-           /*  Cave.  Different messages depending on whether above ground. */
-           RSPEAK((OUTSID(game.loc) && game.loc != 8) ? 57 : 58);
-           return true;
-       }
-       game.oldlc2=game.oldloc;
-       game.oldloc=game.loc;
-
-L9:    LL=labs(TRAVEL[KK]);
-       if(MOD(LL,1000) == 1 || MOD(LL,1000) == K) goto L10;
-       if(TRAVEL[KK] < 0) goto L50;
-       KK=KK+1;
-       goto L9;
-
-L10:   LL=LL/1000;
-L11:   game.newloc=LL/1000;
-        K=MOD(game.newloc,100);        /* ESR: an instance of NOBJECTS? */
-       if(game.newloc <= 300) goto L13;
-       if(game.prop[K] != game.newloc/100-3) goto L16;
-L12:   if(TRAVEL[KK] < 0)BUG(25);
-       KK=KK+1;
-       game.newloc=labs(TRAVEL[KK])/1000;
-       if(game.newloc == LL) goto L12;
-       LL=game.newloc;
-        goto L11;
-
-L13:   if(game.newloc <= 100) goto L14;        /* ESR: an instance of NOBJECTS? */
-       if(TOTING(K) || (game.newloc > 200 && AT(K))) goto L16;
-        goto L12;
-
-L14:   if(game.newloc != 0 && !PCT(game.newloc)) goto L12;
-L16:   game.newloc=MOD(LL,1000);
-       if(game.newloc <= 300) return true;
-       if(game.newloc <= 500) goto L30000;
-       RSPEAK(game.newloc-500);
-       game.newloc=game.loc;
-        return true;
-
-/*  Special motions come here.  Labelling convention: statement numbers NNNXX
- *  (XX=00-99) are used for special case number NNN (NNN=301-500). */
-
-L30000: game.newloc=game.newloc-300;
-        switch (game.newloc) { case 1: goto L30100; case 2: goto L30200; case 3: goto
-               L30300; }
-       BUG(20);
-
-/*  Travel 301.  Plover-alcove passage.  Can carry only emerald.  Note: travel
- *  table must include "useless" entries going through passage, which can never
- *  be used for actual motion, but can be spotted by "go back". */
-
-L30100: game.newloc=99+100-game.loc;   /* ESR: an instance of NOBJECTS? */
-       if(game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) return true;
-       game.newloc=game.loc;
-       RSPEAK(117);
-       return true;
-
-/*  Travel 302.  Plover transport.  Drop the emerald (only use special travel if
- *  toting it), so he's forced to use the plover-passage to get it out.  Having
- *  dropped it, go back and pretend he wasn't carrying it after all. */
-
-L30200: DROP(EMRALD,game.loc);
-        goto L12;
-
-/*  Travel 303.  Troll bridge.  Must be done only as special motion so that
- *  dwarves won't wander across and encounter the bear.  (They won't follow the
- *  player there because that region is forbidden to the pirate.)  If
- *  game.prop(TROLL)=1, he's crossed since paying, so step out and block him.
- *  (standard travel entries check for game.prop(TROLL)=0.)  Special stuff for bear. */
-
-L30300: if(game.prop[TROLL] != 1) goto L30310;
-       PSPEAK(TROLL,1);
-       game.prop[TROLL]=0;
-       MOVE(TROLL2,0);
-       MOVE(TROLL2+NOBJECTS,0);
-       MOVE(TROLL,PLAC[TROLL]);
-       MOVE(TROLL+NOBJECTS,FIXD[TROLL]);
-       JUGGLE(CHASM);
-       game.newloc=game.loc;
-       return true;
-
-L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc;
-       if(game.prop[TROLL] == 0)game.prop[TROLL]=1;
-       if(!TOTING(BEAR)) return true;
-       RSPEAK(162);
-       game.prop[CHASM]=1;
-       game.prop[TROLL]=2;
-       DROP(BEAR,game.newloc);
-       game.fixed[BEAR]= -1;
-       game.prop[BEAR]=3;
-       game.oldlc2=game.newloc;
-       croak(cmdin);
-       goto L2000;
-
-/*  End of specials. */
-
-L21:   LL=MOD((labs(TRAVEL[KK])/1000),1000);
-       if(LL != K) {
-               if(LL <= 300) {
-                       J=KEY[LL];
-                       if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K)
-                               K2=KK;
-               }
-               if(TRAVEL[KK] < 0)
-                   goto L23;
-               KK=KK+1;
-               goto L21;
-
-L23:           KK=K2;
-               if(KK == 0) {
-                       RSPEAK(140);
-                       return true;
-               }
-       }
-
-       K=MOD(labs(TRAVEL[KK]),1000);
-       KK=KEY[game.loc];
-       goto L9;
-
-
-/*  Non-applicable motion.  Various messages depending on word given. */
-
-L50:   SPK=12;
-       if(K >= 43 && K <= 50)SPK=52;
-       if(K == 29 || K == 30)SPK=52;
-       if(K == 7 || K == 36 || K == 37)SPK=10;
-       if(K == 11 || K == 19)SPK=11;
-       if(VERB == FIND || VERB == INVENT)SPK=59;
-       if(K == 62 || K == 65)SPK=42;
-       if(K == 17)SPK=80;
-       RSPEAK(SPK);
-       return true;
-
-/*  "You're dead, Jim."
- *
- *  If the current loc is zero, it means the clown got himself killed.  We'll
- *  allow this maxdie times.  MAXDIE is automatically set based on the number of
- *  snide messages available.  Each death results in a message (81, 83, etc.)
- *  which offers reincarnation; if accepted, this results in message 82, 84,
- *  etc.  The last time, if he wants another chance, he gets a snide remark as
- *  we exit.  When reincarnated, all objects being carried get dropped at game.oldlc2
- *  (presumably the last place prior to being killed) without change of props.
- *  the loop runs backwards to assure that the bird is dropped before the cage.
- *  (this kluge could be changed once we're sure all references to bird and cage
- *  are done by keywords.)  The lamp is a special case (it wouldn't do to leave
- *  it in the cave).  It is turned off and left outside the building (only if he
- *  was carrying it, of course).  He himself is left inside the building (and
- *  heaven help him if he tries to xyzzy back into the cave without the lamp!).
- *  game.oldloc is zapped so he can't just "retreat". */
-
-/*  The easiest way to get killed is to fall into a pit in pitch darkness. */
-
-L90:   RSPEAK(23);
-       game.oldlc2=game.loc;
-       croak(cmdin);
-       goto L2000;
+       else
+           goto L2000;

 
 /*  Cave closing and scoring */
 
 
 /*  Cave closing and scoring */
 

-

 /*  These sections handle the closing of the cave.  The cave closes "clock1"
  *  turns after the last treasure has been located (including the pirate's
  *  chest, which may of course never show up).  Note that the treasures need not
 /*  These sections handle the closing of the cave.  The cave closes "clock1"
  *  turns after the last treasure has been located (including the pirate's
  *  chest, which may of course never show up).  Note that the treasures need not


@@ -907,16 +954,16 @@ L90:      RSPEAK(23);
 
 L10000: game.prop[GRATE]=0;
        game.prop[FISSUR]=0;
 
 L10000: game.prop[GRATE]=0;
        game.prop[FISSUR]=0;

-       for (I=1; I<=NDWARVES; I++) {
-       game.dseen[I]=false;
-       game.dloc[I]=0;
-       } /* end loop */
+       for (i=1; i<=NDWARVES; i++) {
+           game.dseen[i]=false;
+           game.dloc[i]=0;
+       }

        MOVE(TROLL,0);
        MOVE(TROLL+NOBJECTS,0);
        MOVE(TROLL2,PLAC[TROLL]);
        MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
        JUGGLE(CHASM);
        MOVE(TROLL,0);
        MOVE(TROLL+NOBJECTS,0);
        MOVE(TROLL2,PLAC[TROLL]);
        MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
        JUGGLE(CHASM);

-       if(game.prop[BEAR] != 3)DSTROY(BEAR);
+       if (game.prop[BEAR] != 3)DSTROY(BEAR);

        game.prop[CHAIN]=0;
        game.fixed[CHAIN]=0;
        game.prop[AXE]=0;
        game.prop[CHAIN]=0;
        game.fixed[CHAIN]=0;
        game.prop[AXE]=0;


@@ -924,7 +971,7 @@ L10000: game.prop[GRATE]=0;
        RSPEAK(129);
        game.clock1= -1;
        game.closng=true;
        RSPEAK(129);
        game.clock1= -1;
        game.closng=true;

-        goto L19999;
+       goto L19999;

 
 /*  Once he's panicked, and clock2 has run out, we come here to set up the
  *  storage room.  The room has two locs, hardwired as 115 (ne) and 116 (sw).
 
 /*  Once he's panicked, and clock2 has run out, we come here to set up the
  *  storage room.  The room has two locs, hardwired as 115 (ne) and 116 (sw).


@@ -951,9 +998,9 @@ L11000: game.prop[BOTTLE]=PUT(BOTTLE,115,1);
 
 /*  Leave the grate with normal (non-negative) property.  Reuse sign. */
 
 
 /*  Leave the grate with normal (non-negative) property.  Reuse sign. */
 

-       I=PUT(GRATE,116,0);
-       I=PUT(SIGN,116,0);
-       OBJTXT[SIGN]=OBJTXT[SIGN]+1;
+       PUT(GRATE,116,0);
+       PUT(SIGN,116,0);
+       ++OBJTXT[SIGN];

        game.prop[SNAKE]=PUT(SNAKE,116,1);
        game.prop[BIRD]=PUT(BIRD,116,1);
        game.prop[CAGE]=PUT(CAGE,116,0);
        game.prop[SNAKE]=PUT(SNAKE,116,1);
        game.prop[BIRD]=PUT(BIRD,116,1);
        game.prop[CAGE]=PUT(CAGE,116,0);


@@ -963,10 +1010,10 @@ L11000: game.prop[BOTTLE]=PUT(BOTTLE,115,1);
        game.prop[MIRROR]=PUT(MIRROR,115,0);
        game.fixed[MIRROR]=116;
 
        game.prop[MIRROR]=PUT(MIRROR,115,0);
        game.fixed[MIRROR]=116;
 

-       for (I=1; I<=NOBJECTS; I++) {
-               if(TOTING(I))
-                       DSTROY(I);
-       } /* end loop */
+       for (int i=1; i<=NOBJECTS; i++) {
+           if (TOTING(i))
+               DSTROY(i);
+       }

 
        RSPEAK(132);
        game.closed=true;
 
        RSPEAK(132);
        game.closed=true;


@@ -980,22 +1027,22 @@ L11000: game.prop[BOTTLE]=PUT(BOTTLE,115,1);
 
 L12000: RSPEAK(188);
        game.prop[BATTER]=1;
 
 L12000: RSPEAK(188);
        game.prop[BATTER]=1;

-       if(TOTING(BATTER))DROP(BATTER,game.loc);
+       if (TOTING(BATTER))DROP(BATTER,game.loc);

        game.limit=game.limit+2500;
        game.lmwarn=false;
         goto L19999;
 
        game.limit=game.limit+2500;
        game.lmwarn=false;
         goto L19999;
 

-L12200: if(game.lmwarn || !HERE(LAMP)) goto L19999;
+L12200: if (game.lmwarn || !HERE(LAMP)) goto L19999;

        game.lmwarn=true;
        SPK=187;
        game.lmwarn=true;
        SPK=187;

-       if(game.place[BATTER] == 0)SPK=183;
-       if(game.prop[BATTER] == 1)SPK=189;
+       if (game.place[BATTER] == 0)SPK=183;
+       if (game.prop[BATTER] == 1)SPK=189;

        RSPEAK(SPK);
         goto L19999;
 
 L12400: game.limit= -1;
        game.prop[LAMP]=0;
        RSPEAK(SPK);
         goto L19999;
 
 L12400: game.limit= -1;
        game.prop[LAMP]=0;

-       if(HERE(LAMP))RSPEAK(184);
+       if (HERE(LAMP))RSPEAK(184);

         goto L19999;
 
 /*  Oh dear, he's disturbed the dwarves. */
         goto L19999;
 
 /*  Oh dear, he's disturbed the dwarves. */