First step in game state encapsulation: the dwarf & pirate locations.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index e2c24e59847abc01b035fecc4432fd93da044e3e..75982c651cab10000f7e3b868dd3eab0c512239b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -8,32 +8,34 @@
 #include <stdbool.h>
 #include <getopt.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <getopt.h>
 #include <signal.h>

-#include "main.h"
+#include <time.h>
+#include "advent.h"

 #include "database.h"
 #include "database.h"

-#include "misc.h"
+
+struct game_t game;

 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,

-               DLOC[7], FIXED[101], HOLDNG,
-               LINK[201], LNLENG, LNPOSN,
-               PARMS[26], PLACE[101],
+               FIXED[NOBJECTS+1], HOLDNG,
+               LINK[NOBJECTS*2 + 1], LNLENG, LNPOSN,
+               PARMS[26], PLACE[NOBJECTS+1],

                SETUP = 0;
                SETUP = 0;

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

 
 long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
                 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
                CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
                COINS, CONDS, DALTLC, DETAIL,
 
 long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
                 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
                CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
                COINS, CONDS, DALTLC, DETAIL,

-                DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
+               DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS,

                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
                GRATE, HINT, HINTED[21], HINTLC[21],
                I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
                KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
                LMWARN, LOC, LOCK, LOOK,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
                GRATE, HINT, HINTED[21], HINTLC[21],
                I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
                KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
                LMWARN, LOC, LOCK, LOOK,

-               MAGZIN, MAXDIE, MAXTRS, MESH = 123456789,
+               MAGZIN, MAXDIE, MAXTRS,

                MESSAG, MIRROR, MXSCOR,
                NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
                MESSAG, MIRROR, MXSCOR,
                NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,

-               ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
-               PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], PYRAM,
+               OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+               PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM,

                RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
                SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
                STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
                RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
                SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
                STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,


@@ -109,7 +111,8 @@ int main(int argc, char *argv[]) {
        lcgstate.a = 1093;
        lcgstate.c = 221587;
        lcgstate.m = 1048576;
        lcgstate.a = 1093;
        lcgstate.c = 221587;
        lcgstate.m = 1048576;

-       long seedval = (long)time(NULL);
+       srand(time(NULL));
+       long seedval = (long)rand();

        set_seed(seedval);
 
 /*  Read the database if we have not yet done so */
        set_seed(seedval);
 
 /*  Read the database if we have not yet done so */


@@ -130,7 +133,7 @@ int main(int argc, char *argv[]) {
 
 L1:    SETUP= -1;
        I=0;
 
 L1:    SETUP= -1;
        I=0;

-       ZZWORD=RNDVOC(3,0)+MESH*2;
+       ZZWORD=RNDVOC(3,0);

        NOVICE=YES(stdin, 65,1,0);
        NEWLOC=1;
        LOC=1;
        NOVICE=YES(stdin, 65,1,0);
        NEWLOC=1;
        LOC=1;


@@ -139,7 +142,7 @@ L1: SETUP= -1;
 
        if (logfp)
            fprintf(logfp, "seed %ld\n", seedval);
 
        if (logfp)
            fprintf(logfp, "seed %ld\n", seedval);

-       
+

        for (;;) {
            if (!do_command(stdin))
                break;
        for (;;) {
            if (!do_command(stdin))
                break;


@@ -147,15 +150,17 @@ L1:       SETUP= -1;
        score(1);
 }
 
        score(1);
 }
 

-static bool fallback_handler(signed char *buf)
+static bool fallback_handler(char *buf)

 /* fallback handler for commands not handled by FORTRANish parser */
 {
     long sv;
     if (sscanf(buf, "seed %ld", &sv) == 1) {
        set_seed(sv);
        printf("Seed set to %ld\n", sv);
 /* fallback handler for commands not handled by FORTRANish parser */
 {
     long sv;
     if (sscanf(buf, "seed %ld", &sv) == 1) {
        set_seed(sv);
        printf("Seed set to %ld\n", sv);

+       // autogenerated, so don't charge user time for it.
+       --TURNS;

        // here we reconfigure any global game state that uses random numbers
        // here we reconfigure any global game state that uses random numbers

-       ZZWORD=RNDVOC(3,0)+MESH*2;
+       ZZWORD=RNDVOC(3,0);

        return true;
     }
     return false;
        return true;
     }
     return false;


@@ -176,8 +181,8 @@ static bool do_command(FILE *cmdin) {
  *  (dwarves rooted in place) let him get out (and attacked). */
 
 L71:   if(NEWLOC == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74;
  *  (dwarves rooted in place) let him get out (and attacked). */
 
 L71:   if(NEWLOC == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74;

-       /* 73 */ for (I=1; I<=5; I++) {
-       if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73;
+       /* 73 */ for (I=1; I<=NDWARVES-1; I++) {
+       if(game.odloc[I] != NEWLOC || !game.dseen[I]) goto L73;

        NEWLOC=LOC;
        RSPEAK(2);
         goto L74;
        NEWLOC=LOC;
        RSPEAK(2);
         goto L74;


@@ -207,12 +212,12 @@ L6000:    if(DFLAG != 1) goto L6010;
        if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
        DFLAG=2;
        for (I=1; I<=2; I++) {
        if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
        DFLAG=2;
        for (I=1; I<=2; I++) {

-       J=1+randrange(5);
-       if(PCT(50))DLOC[J]=0;
+       J=1+randrange(NDWARVES-1);
+       if(PCT(50))game.dloc[J]=0;

        } /* end loop */
        } /* end loop */

-       for (I=1; I<=5; I++) {
-       if(DLOC[I] == LOC)DLOC[I]=DALTLC;
-       ODLOC[I]=DLOC[I];
+       for (I=1; I<=NDWARVES-1; I++) {
+       if(game.dloc[I] == LOC)game.dloc[I]=DALTLC;
+       game.odloc[I]=game.dloc[I];

        } /* end loop */
        RSPEAK(3);
        DROP(AXE,LOC);
        } /* end loop */
        RSPEAK(3);
        DROP(AXE,LOC);


@@ -226,31 +231,31 @@ L6000:    if(DFLAG != 1) goto L6010;
 L6010: DTOTAL=0;
        ATTACK=0;
        STICK=0;
 L6010: DTOTAL=0;
        ATTACK=0;
        STICK=0;

-       /* 6030 */ for (I=1; I<=6; I++) {
-       if(DLOC[I] == 0) goto L6030;
+       /* 6030 */ for (I=1; I<=NDWARVES; I++) {
+       if(game.dloc[I] == 0) goto L6030;

 /*  Fill TK array with all the places this dwarf might go. */
        J=1;
 /*  Fill TK array with all the places this dwarf might go. */
        J=1;

-       KK=DLOC[I];
+       KK=game.dloc[I];

        KK=KEY[KK];
        if(KK == 0) goto L6016;
        KK=KEY[KK];
        if(KK == 0) goto L6016;

-L6012: NEWLOC=MOD(IABS(TRAVEL[KK])/1000,1000);
+L6012: NEWLOC=MOD(labs(TRAVEL[KK])/1000,1000);

        {long x = J-1;
        {long x = J-1;

-       if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == ODLOC[I] || (J > 1 &&
-               NEWLOC == TK[x]) || J >= 20 || NEWLOC == DLOC[I] ||
+       if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == game.odloc[I] || (J > 1 &&
+               NEWLOC == TK[x]) || J >= 20 || NEWLOC == game.dloc[I] ||

                FORCED(NEWLOC) || (I == 6 && CNDBIT(NEWLOC,3)) ||
                FORCED(NEWLOC) || (I == 6 && CNDBIT(NEWLOC,3)) ||

-               IABS(TRAVEL[KK])/1000000 == 100) goto L6014;}
+               labs(TRAVEL[KK])/1000000 == 100) goto L6014;}

        TK[J]=NEWLOC;
        J=J+1;
 L6014: KK=KK+1;
        {long x = KK-1; if(TRAVEL[x] >= 0) goto L6012;}
        TK[J]=NEWLOC;
        J=J+1;
 L6014: KK=KK+1;
        {long x = KK-1; if(TRAVEL[x] >= 0) goto L6012;}

-L6016: TK[J]=ODLOC[I];
+L6016: TK[J]=game.odloc[I];

        if(J >= 2)J=J-1;
        J=1+randrange(J);
        if(J >= 2)J=J-1;
        J=1+randrange(J);

-       ODLOC[I]=DLOC[I];
-       DLOC[I]=TK[J];
-       DSEEN[I]=(DSEEN[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC);
-       if(!DSEEN[I]) goto L6030;
-       DLOC[I]=LOC;
+       game.odloc[I]=game.dloc[I];
+       game.dloc[I]=TK[J];
+       game.dseen[I]=(game.dseen[I] && INDEEP(LOC)) || (game.dloc[I] == LOC || game.odloc[I] == LOC);
+       if(!game.dseen[I]) goto L6030;
+       game.dloc[I]=LOC;

        if(I != 6) goto L6027;
 
 /*  The pirate's spotted him.  He leaves him alone once we've found chest.  K
        if(I != 6) goto L6027;
 
 /*  The pirate's spotted him.  He leaves him alone once we've found chest.  K


@@ -268,7 +273,7 @@ L6020:      if(HERE(J))K=1;
        } /* end loop */
        if(TALLY == 1 && K == 0 && PLACE[CHEST] == 0 && HERE(LAMP) && PROP[LAMP]
                == 1) goto L6025;
        } /* end loop */
        if(TALLY == 1 && K == 0 && PLACE[CHEST] == 0 && HERE(LAMP) && PROP[LAMP]
                == 1) goto L6025;

-       if(ODLOC[6] != DLOC[6] && PCT(20))RSPEAK(127);
+       if(game.odloc[6] != game.dloc[6] && PCT(20))RSPEAK(127);

         goto L6030;
 
 L6021: if(PLACE[CHEST] != 0) goto L6022;
         goto L6030;
 
 L6021: if(PLACE[CHEST] != 0) goto L6022;


@@ -282,9 +287,9 @@ L6022:      RSPEAK(128);
        if(TOTING(J))DROP(J,CHLOC);
 L6023: /*etc*/ ;
        } /* end loop */
        if(TOTING(J))DROP(J,CHLOC);
 L6023: /*etc*/ ;
        } /* end loop */

-L6024: DLOC[6]=CHLOC;
-       ODLOC[6]=CHLOC;
-       DSEEN[6]=false;
+L6024: game.dloc[6]=CHLOC;
+       game.odloc[6]=CHLOC;
+       game.dseen[6]=false;

         goto L6030;
 
 L6025: RSPEAK(186);
         goto L6030;
 
 L6025: RSPEAK(186);


@@ -295,7 +300,7 @@ L6025:      RSPEAK(186);
 /*  This threatening little dwarf is in the room with him! */
 
 L6027: DTOTAL=DTOTAL+1;
 /*  This threatening little dwarf is in the room with him! */
 
 L6027: DTOTAL=DTOTAL+1;

-       if(ODLOC[I] != DLOC[I]) goto L6030;
+       if(game.odloc[I] != game.dloc[I]) goto L6030;

        ATTACK=ATTACK+1;
        if(KNFLOC >= 0)KNFLOC=LOC;
        if(randrange(1000) < 95*(DFLAG-2))STICK=STICK+1;
        ATTACK=ATTACK+1;
        if(KNFLOC >= 0)KNFLOC=LOC;
        if(randrange(1000) < 95*(DFLAG-2))STICK=STICK+1;


@@ -353,7 +358,7 @@ L2001:      if(TOTING(BEAR))RSPEAK(141);
        I=ATLOC[LOC];
 L2004: if(I == 0) goto L2012;
        OBJ=I;
        I=ATLOC[LOC];
 L2004: if(I == 0) goto L2012;
        OBJ=I;

-       if(OBJ > 100)OBJ=OBJ-100;
+       if(OBJ > NOBJECTS)OBJ=OBJ-NOBJECTS;

        if(OBJ == STEPS && TOTING(NUGGET)) goto L2008;
        if(PROP[OBJ] >= 0) goto L2006;
        if(CLOSED) goto L2008;
        if(OBJ == STEPS && TOTING(NUGGET)) goto L2008;
        if(PROP[OBJ] >= 0) goto L2006;
        if(CLOSED) goto L2008;


@@ -399,15 +404,14 @@ L2600:    if(COND[LOC] < CONDS) goto L2603;
 L2602: /*etc*/ ;
        } /* end loop */
 
 L2602: /*etc*/ ;
        } /* end loop */
 

-/*  Kick the random number generator just to add variety to the chase.  Also,
- *  if closing time, check for any objects being toted with PROP < 0 and set
+/*  If closing time, check for any objects being toted with PROP < 0 and set

  *  the prop to -1-PROP.  This way objects won't be described until they've
  *  been picked up and put down separate from their respective piles.  Don't
  *  tick CLOCK1 unless well into cave (and not at Y2). */
 
 L2603: if(!CLOSED) goto L2605;
        if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);
  *  the prop to -1-PROP.  This way objects won't be described until they've
  *  been picked up and put down separate from their respective piles.  Don't
  *  tick CLOCK1 unless well into cave (and not at Y2). */
 
 L2603: if(!CLOSED) goto L2605;
        if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);

-       for (I=1; I<=100; I++) {
+       for (I=1; I<=NOBJECTS; I++) {

        if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I];
        } /* end loop */
 L2605: WZDARK=DARK(0);
        if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I];
        } /* end loop */
 L2605: WZDARK=DARK(0);


@@ -421,13 +425,15 @@ L2605:    WZDARK=DARK(0);
 
 L2607: FOOBAR=(FOOBAR>0 ? -FOOBAR : 0);
        TURNS=TURNS+1;
 
 L2607: FOOBAR=(FOOBAR>0 ? -FOOBAR : 0);
        TURNS=TURNS+1;

-       if(TURNS != THRESH) goto L2608;
+       if(TURNS == THRESH) {

        SPEAK(TTEXT[TRNDEX]);
        TRNLUZ=TRNLUZ+TRNVAL[TRNDEX]/100000;
        TRNDEX=TRNDEX+1;
        THRESH= -1;
        SPEAK(TTEXT[TRNDEX]);
        TRNLUZ=TRNLUZ+TRNVAL[TRNDEX]/100000;
        TRNDEX=TRNDEX+1;
        THRESH= -1;

-       if(TRNDEX <= TRNVLS)THRESH=MOD(TRNVAL[TRNDEX],100000)+1;
-L2608: if(VERB == SAY && WD2 > 0)VERB=0;
+       if(TRNDEX <= TRNVLS)
+           THRESH=MOD(TRNVAL[TRNDEX],100000)+1;
+       }
+       if(VERB == SAY && WD2 > 0)VERB=0;

        if(VERB == SAY) goto L4090;
        if(TALLY == 0 && INDEEP(LOC) && LOC != 33)CLOCK1=CLOCK1-1;
        if(CLOCK1 == 0) goto L10000;
        if(VERB == SAY) goto L4090;
        if(TALLY == 0 && INDEEP(LOC) && LOC != 33)CLOCK1=CLOCK1-1;
        if(CLOCK1 == 0) goto L10000;


@@ -447,12 +453,13 @@ L19999: K=43;
        if((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 !=
                1000+DOOR)) goto L2610;
        {long x = V2-1000; if(AT(x))WD2=MAKEWD(16152118);}
        if((V1 != 1000+WATER && V1 != 1000+OIL) || (V2 != 1000+PLANT && V2 !=
                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))WD1=MAKEWD(301200308);
-L2620: if(WD1 != MAKEWD(23051920)) goto L2625;
-       IWEST=IWEST+1;
-       if(IWEST == 10)RSPEAK(17);
-L2625: if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630;
+L2610: if(V1 == 1000+CAGE && V2 == 1000+BIRD && HERE(CAGE) && HERE(BIRD))
+               WD1=MAKEWD(301200308);
+L2620: if(WD1 == MAKEWD(23051920)) {
+               IWEST=IWEST+1;
+               if(IWEST == 10)RSPEAK(17);
+       }
+       if(WD1 != MAKEWD( 715) || WD2 == 0) goto L2630;

        IGO=IGO+1;
        if(IGO == 10)RSPEAK(276);
 L2630: I=VOCAB(WD1,-1);
        IGO=IGO+1;
        if(IGO == 10)RSPEAK(276);
 L2630: I=VOCAB(WD1,-1);


@@ -513,9 +520,9 @@ L8000:      SETPRM(1,WD1,WD1X);
 /*  Figure out the new location
  *
  *  Given the current location in "LOC", and a motion verb number in "K", put
 /*  Figure out the new location
  *
  *  Given the current location in "LOC", and a motion verb number in "K", put

- *  the new location in "NEWLOC".  The current loc is saved in "OLDLOC" in case
- *  he wants to retreat.  The current OLDLOC is saved in OLDLC2, in case he
- *  dies.  (if he does, NEWLOC will be limbo, and OLDLOC will be what killed
+ *  the new location in "NEWLOC".  The current loc is saved in "OLgame.dloc" in case
+ *  he wants to retreat.  The current OLgame.dloc is saved in OLDLC2, in case he
+ *  dies.  (if he does, NEWLOC will be limbo, and OLgame.dloc will be what killed

  *  him, so we need OLDLC2, which is the last place he was safe.) */
 
 L8:    KK=KEY[LOC];
  *  him, so we need OLDLC2, which is the last place he was safe.) */
 
 L8:    KK=KEY[LOC];


@@ -528,7 +535,7 @@ L8: KK=KEY[LOC];
        OLDLC2=OLDLOC;
        OLDLOC=LOC;
 
        OLDLC2=OLDLOC;
        OLDLOC=LOC;
 

-L9:    LL=IABS(TRAVEL[KK]);
+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;
        if(MOD(LL,1000) == 1 || MOD(LL,1000) == K) goto L10;
        if(TRAVEL[KK] < 0) goto L50;
        KK=KK+1;


@@ -536,17 +543,17 @@ L9:       LL=IABS(TRAVEL[KK]);
 
 L10:   LL=LL/1000;
 L11:   NEWLOC=LL/1000;
 
 L10:   LL=LL/1000;
 L11:   NEWLOC=LL/1000;

-       K=MOD(NEWLOC,100);
+        K=MOD(NEWLOC,100);     /* ESR: an instance of NOBJECTS? */

        if(NEWLOC <= 300) goto L13;
        if(PROP[K] != NEWLOC/100-3) goto L16;
 L12:   if(TRAVEL[KK] < 0)BUG(25);
        KK=KK+1;
        if(NEWLOC <= 300) goto L13;
        if(PROP[K] != NEWLOC/100-3) goto L16;
 L12:   if(TRAVEL[KK] < 0)BUG(25);
        KK=KK+1;

-       NEWLOC=IABS(TRAVEL[KK])/1000;
+       NEWLOC=labs(TRAVEL[KK])/1000;

        if(NEWLOC == LL) goto L12;
        LL=NEWLOC;
         goto L11;
 
        if(NEWLOC == LL) goto L12;
        LL=NEWLOC;
         goto L11;
 

-L13:   if(NEWLOC <= 100) goto L14;
+L13:   if(NEWLOC <= 100) goto L14;     /* ESR: an instance of NOBJECTS? */

        if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16;
         goto L12;
 
        if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16;
         goto L12;
 


@@ -570,7 +577,7 @@ L30000: NEWLOC=NEWLOC-300;
  *  table must include "useless" entries going through passage, which can never
  *  be used for actual motion, but can be spotted by "go back". */
 
  *  table must include "useless" entries going through passage, which can never
  *  be used for actual motion, but can be spotted by "go back". */
 

-L30100: NEWLOC=99+100-LOC;
+L30100: NEWLOC=99+100-LOC;     /* ESR: an instance of NOBJECTS? */

        if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true;
        NEWLOC=LOC;
        RSPEAK(117);
        if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true;
        NEWLOC=LOC;
        RSPEAK(117);


@@ -593,9 +600,9 @@ L30300: if(PROP[TROLL] != 1) goto L30310;
        PSPEAK(TROLL,1);
        PROP[TROLL]=0;
        MOVE(TROLL2,0);
        PSPEAK(TROLL,1);
        PROP[TROLL]=0;
        MOVE(TROLL2,0);

-       MOVE(TROLL2+100,0);
+       MOVE(TROLL2+NOBJECTS,0);

        MOVE(TROLL,PLAC[TROLL]);
        MOVE(TROLL,PLAC[TROLL]);

-       MOVE(TROLL+100,FIXD[TROLL]);
+       MOVE(TROLL+NOBJECTS,FIXD[TROLL]);

        JUGGLE(CHASM);
        NEWLOC=LOC;
        return true;
        JUGGLE(CHASM);
        NEWLOC=LOC;
        return true;


@@ -628,21 +635,25 @@ L20:      K=OLDLOC;
        RSPEAK(K2);
        return true;
 
        RSPEAK(K2);
        return true;
 

-L21:   LL=MOD((IABS(TRAVEL[KK])/1000),1000);
-       if(LL == K) goto L25;
-       if(LL > 300) goto L22;
-       J=KEY[LL];
-       if(FORCED(LL) && MOD((IABS(TRAVEL[J])/1000),1000) == K)K2=KK;
-L22:   if(TRAVEL[KK] < 0) goto L23;
-       KK=KK+1;
-        goto L21;
-
-L23:   KK=K2;
-       if(KK != 0) goto L25;
-       RSPEAK(140);
-       return true;
+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;
+               }
+       }

 
 

-L25:   K=MOD(IABS(TRAVEL[KK]),1000);
+       K=MOD(labs(TRAVEL[KK]),1000);

        KK=KEY[LOC];
         goto L9;
 
        KK=KEY[LOC];
         goto L9;
 


@@ -706,8 +717,8 @@ L99:        if(CLOSNG) goto L95;
        PLACE[WATER]=0;
        PLACE[OIL]=0;
        if(TOTING(LAMP))PROP[LAMP]=0;
        PLACE[WATER]=0;
        PLACE[OIL]=0;
        if(TOTING(LAMP))PROP[LAMP]=0;

-       /* 98 */ for (J=1; J<=100; J++) {
-       I=101-J;
+       /* 98 */ for (J=1; J<=NOBJECTS; J++) {
+       I=NOBJECTS + 1 - J;

        if(!TOTING(I)) goto L98;
        K=OLDLC2;
        if(I == LAMP)K=1;
        if(!TOTING(I)) goto L98;
        K=OLDLC2;
        if(I == LAMP)K=1;


@@ -825,14 +836,14 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010;
 
 L10000: PROP[GRATE]=0;
        PROP[FISSUR]=0;
 
 L10000: PROP[GRATE]=0;
        PROP[FISSUR]=0;

-       for (I=1; I<=6; I++) {
-       DSEEN[I]=false;
-       DLOC[I]=0;
+       for (I=1; I<=NDWARVES; I++) {
+       game.dseen[I]=false;
+       game.dloc[I]=0;

        } /* end loop */
        MOVE(TROLL,0);
        } /* end loop */
        MOVE(TROLL,0);

-       MOVE(TROLL+100,0);
+       MOVE(TROLL+NOBJECTS,0);

        MOVE(TROLL2,PLAC[TROLL]);
        MOVE(TROLL2,PLAC[TROLL]);

-       MOVE(TROLL2+100,FIXD[TROLL]);
+       MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);

        JUGGLE(CHASM);
        if(PROP[BEAR] != 3)DSTROY(BEAR);
        PROP[CHAIN]=0;
        JUGGLE(CHASM);
        if(PROP[BEAR] != 3)DSTROY(BEAR);
        PROP[CHAIN]=0;


@@ -881,8 +892,9 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
        PROP[MIRROR]=PUT(MIRROR,115,0);
        FIXED[MIRROR]=116;
 
        PROP[MIRROR]=PUT(MIRROR,115,0);
        FIXED[MIRROR]=116;
 

-       for (I=1; I<=100; I++) {
-       if(TOTING(I))DSTROY(I);
+       for (I=1; I<=NOBJECTS; I++) {
+               if(TOTING(I))
+                       DSTROY(I);

        } /* end loop */
 
        RSPEAK(132);
        } /* end loop */
 
        RSPEAK(132);


@@ -920,4 +932,5 @@ L12400: LIMIT= -1;
 L18999: RSPEAK(SPK);
 L19000: RSPEAK(136);
        score(0);
 L18999: RSPEAK(SPK);
 L19000: RSPEAK(136);
        score(0);

+       return true;

 }
 }