Gotoectomy+.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 6c5512721c9daddaae1079ad9259ee2bb17a8946..698163aeea417b686e2edc2efff69e91a79ba129 100644 (file)
--- a/main.c
+++ b/main.c
@@ -13,9 +13,9 @@
 #include "database.h"
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
 #include "database.h"
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,

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

                SETUP = 0;
 char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
                SETUP = 0;
 char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 


@@ -23,7 +23,7 @@ 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,
                 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, DSEEN[NDWARVES+1], 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,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
                GRATE, HINT, HINTED[21], HINTLC[21],
                I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,


@@ -32,8 +32,8 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
                MAGZIN, MAXDIE, MAXTRS,
                MESSAG, MIRROR, MXSCOR,
                NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
                MAGZIN, MAXDIE, MAXTRS,
                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,
+               ODLOC[NDWARVES+1], 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,


@@ -179,7 +179,7 @@ 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++) {
+       /* 73 */ for (I=1; I<=NDWARVES-1; I++) {

        if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73;
        NEWLOC=LOC;
        RSPEAK(2);
        if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73;
        NEWLOC=LOC;
        RSPEAK(2);


@@ -210,10 +210,10 @@ 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);
+       J=1+randrange(NDWARVES-1);

        if(PCT(50))DLOC[J]=0;
        } /* end loop */
        if(PCT(50))DLOC[J]=0;
        } /* end loop */

-       for (I=1; I<=5; I++) {
+       for (I=1; I<=NDWARVES-1; I++) {

        if(DLOC[I] == LOC)DLOC[I]=DALTLC;
        ODLOC[I]=DLOC[I];
        } /* end loop */
        if(DLOC[I] == LOC)DLOC[I]=DALTLC;
        ODLOC[I]=DLOC[I];
        } /* end loop */


@@ -229,19 +229,19 @@ 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++) {
+       /* 6030 */ for (I=1; I<=NDWARVES; I++) {

        if(DLOC[I] == 0) goto L6030;
 /*  Fill TK array with all the places this dwarf might go. */
        J=1;
        KK=DLOC[I];
        KK=KEY[KK];
        if(KK == 0) goto L6016;
        if(DLOC[I] == 0) goto L6030;
 /*  Fill TK array with all the places this dwarf might go. */
        J=1;
        KK=DLOC[I];
        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;
        if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == ODLOC[I] || (J > 1 &&
                NEWLOC == TK[x]) || J >= 20 || NEWLOC == DLOC[I] ||
                FORCED(NEWLOC) || (I == 6 && CNDBIT(NEWLOC,3)) ||
        {long x = J-1;
        if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == ODLOC[I] || (J > 1 &&
                NEWLOC == TK[x]) || J >= 20 || NEWLOC == DLOC[I] ||
                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;
        TK[J]=NEWLOC;
        J=J+1;
 L6014: KK=KK+1;


@@ -356,7 +356,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;


@@ -409,7 +409,7 @@ L2602:      /*etc*/ ;
 
 L2603: if(!CLOSED) goto L2605;
        if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);
 
 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);


@@ -423,13 +423,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;


@@ -449,12 +451,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);


@@ -530,7 +533,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;


@@ -538,17 +541,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;
 


@@ -572,7 +575,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);


@@ -595,9 +598,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;


@@ -630,21 +633,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;
 


@@ -708,8 +715,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;


@@ -827,14 +834,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++) {
+       for (I=1; I<=NDWARVES; I++) {

        DSEEN[I]=false;
        DLOC[I]=0;
        } /* end loop */
        MOVE(TROLL,0);
        DSEEN[I]=false;
        DLOC[I]=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;


@@ -883,8 +890,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);