Move more globals into the game state block.

[open-adventure.git] / actions2.c

diff --git a/actions2.c b/actions2.c
index ea236a37eb27e590eb326b64bbf88307e15b1700..30784088192abf3d8a5c3ba749b96187db0f922d 100644 (file)
--- a/actions2.c
+++ b/actions2.c
@@ -29,7 +29,7 @@ L9011:        if(FIXED[OBJ] != 0) return(2011);
        if(!TOTING(BOTTLE))SPK=104;
         return(2011);
 L9017: SPK=92;
-       if(HOLDNG >= 7) return(2011);
+       if(game.holdng >= 7) return(2011);
        if(OBJ != BIRD || PROP[BIRD] == 1 || -1-PROP[BIRD] == 1) goto L9014;
        if(PROP[BIRD] == 2) goto L9015;
        if(!TOTING(CAGE))SPK=27;
@@ -61,7 +61,7 @@ int discard(bool just_do_it) {
        if(!TOTING(OBJ)) return(2011);
        if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
        RSPEAK(30);
-       if(CLOSED) return(19000);
+       if(game.closed) return(19000);
        DSTROY(SNAKE);
 /*  SET PROP FOR USE BY TRAVEL OPTIONS */
        PROP[SNAKE]=1;
@@ -89,7 +89,7 @@ L9023:        if(!(GSTONE(OBJ) && AT(CAVITY) && PROP[CAVITY] != 0)) goto L9024;
        K=2-PROP[RUG];
        PROP[RUG]=K;
        if(K == 2)K=PLAC[SAPPH];
-       MOVE(RUG+100,K);
+       MOVE(RUG+NOBJECTS,K);
         goto L9021;
 
 L9024: if(OBJ != COINS || !HERE(VEND)) goto L9025;
@@ -107,9 +107,9 @@ L9025:      if(OBJ != BIRD || !AT(DRAGON) || PROP[DRAGON] != 0) goto L9026;
 L9026: if(OBJ != BEAR || !AT(TROLL)) goto L9027;
        RSPEAK(163);
        MOVE(TROLL,0);
-       MOVE(TROLL+100,0);
+       MOVE(TROLL+NOBJECTS,0);
        MOVE(TROLL2,PLAC[TROLL]);
-       MOVE(TROLL2+100,FIXD[TROLL]);
+       MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
        JUGGLE(CHASM);
        PROP[TROLL]=2;
         goto L9021;
@@ -133,22 +133,22 @@ int attack(FILE *input) {
        I=ATDWRF(LOC);
        if(OBJ != 0) goto L9124;
        if(I > 0)OBJ=DWARF;
-       if(HERE(SNAKE))OBJ=OBJ*100+SNAKE;
-       if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*100+DRAGON;
-       if(AT(TROLL))OBJ=OBJ*100+TROLL;
-       if(AT(OGRE))OBJ=OBJ*100+OGRE;
-       if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*100+BEAR;
-       if(OBJ > 100) return(8000);
+       if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE;
+       if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON;
+       if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL;
+       if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE;
+       if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR;
+       if(OBJ > NOBJECTS) return(8000);
        if(OBJ != 0) goto L9124;
 /*  CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */
        if(HERE(BIRD) && VERB != THROW)OBJ=BIRD;
-       if(HERE(VEND) && VERB != THROW)OBJ=OBJ*100+VEND;
+       if(HERE(VEND) && VERB != THROW)OBJ=OBJ*NOBJECTS+VEND;
 /*  CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
-       if(HERE(CLAM) || HERE(OYSTER))OBJ=100*OBJ+CLAM;
-       if(OBJ > 100) return(8000);
+       if(HERE(CLAM) || HERE(OYSTER))OBJ=NOBJECTS*OBJ+CLAM;
+       if(OBJ > NOBJECTS) return(8000);
 L9124: if(OBJ == BIRD) {
                SPK=137;
-               if(CLOSED) return(2011);
+               if(game.closed) return(2011);
                DSTROY(BIRD);
                PROP[BIRD]=0;
                SPK=45;
@@ -162,7 +162,7 @@ L9126:      if(OBJ == 0)SPK=44;
        if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
        if(OBJ == SNAKE)SPK=46;
        if(OBJ == DWARF)SPK=49;
-       if(OBJ == DWARF && CLOSED) return(19000);
+       if(OBJ == DWARF && game.closed) return(19000);
        if(OBJ == DRAGON)SPK=167;
        if(OBJ == TROLL)SPK=157;
        if(OBJ == OGRE)SPK=203;
@@ -181,12 +181,12 @@ L9126:    if(OBJ == 0)SPK=44;
        PROP[DRAGON]=1;
        PROP[RUG]=0;
        K=(PLAC[DRAGON]+FIXD[DRAGON])/2;
-       MOVE(DRAGON+100,-1);
-       MOVE(RUG+100,0);
+       MOVE(DRAGON+NOBJECTS,-1);
+       MOVE(RUG+NOBJECTS,0);
        MOVE(DRAGON,K);
        MOVE(RUG,K);
        DROP(BLOOD,K);
-       for (OBJ=1; OBJ<=100; OBJ++) {
+       for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
        if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
        /*etc*/ ;
        } /* end loop */
@@ -198,11 +198,11 @@ L9128:    RSPEAK(SPK);
        RSPEAK(6);
        DSTROY(OGRE);
        K=0;
-       for (I=1; I<=5; I++) {
-               if(DLOC[I] == LOC) {
+       for (I=1; I < PIRATE; I++) {
+               if(game.dloc[I] == LOC) {
                        K=K+1;
-                       DLOC[I]=61;
-                       DSEEN[I]=false;
+                       game.dloc[I]=61;
+                       game.dseen[I]=false;
                }
        }
        SPK=SPK+1+1/K;
@@ -232,12 +232,12 @@ int throw(FILE *cmdin) {
        return(attack(cmdin));
 
 L9172: SPK=48;
-       if(randrange(7) < DFLAG) goto L9175;
-       DSEEN[I]=false;
-       DLOC[I]=0;
+       if(randrange(NDWARVES+1) < game.dflag) goto L9175;
+       game.dseen[I]=false;
+       game.dloc[I]=0;
        SPK=47;
-       DKILL=DKILL+1;
-       if(DKILL == 1)SPK=149;
+       game.dkill=game.dkill+1;
+       if(game.dkill == 1)SPK=149;
 L9175: RSPEAK(SPK);
        DROP(AXE,LOC);
        K=NUL;
@@ -259,9 +259,9 @@ L9178:      SPK=159;
 /*  Snarf a treasure for the troll. */
        DROP(OBJ,0);
        MOVE(TROLL,0);
-       MOVE(TROLL+100,0);
+       MOVE(TROLL+NOBJECTS,0);
        DROP(TROLL2,PLAC[TROLL]);
-       DROP(TROLL2+100,FIXD[TROLL]);
+       DROP(TROLL2+NOBJECTS,FIXD[TROLL]);
        JUGGLE(CHASM);
         return(2011);
 }
@@ -278,7 +278,7 @@ L9212:      if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
        SPK=102;
        if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
        if(OBJ == TROLL)SPK=182;
-       if(OBJ != SNAKE || CLOSED || !HERE(BIRD)) return(2011);
+       if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
        SPK=101;
        DSTROY(BIRD);
        PROP[BIRD]=0;
@@ -287,7 +287,7 @@ L9212:      if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
 L9213: if(OBJ != DWARF) goto L9214;
        if(!HERE(FOOD)) return(2011);
        SPK=103;
-       DFLAG=DFLAG+2;
+       game.dflag=game.dflag+2;
         return(2011);
 
 L9214: if(OBJ != BEAR) goto L9215;