More collecting of globals.

[open-adventure.git] / actions2.c

diff --git a/actions2.c b/actions2.c
index 208a453b402768e76d1fdc39466bfe0ac6868bee..043913e1ca4abfeaaab2c3c8bb42e9e440b2574a 100644 (file)
--- a/actions2.c
+++ b/actions2.c
@@ -19,7 +19,7 @@ int carry(void) {
        if(OBJ != MESSAG) goto L9011;
        SPK=190;
        DSTROY(MESSAG);
-L9011: if(FIXED[OBJ] != 0) return(2011);
+L9011: if(game.fixed[OBJ] != 0) return(2011);
        if(OBJ != WATER && OBJ != OIL) goto L9017;
        K=OBJ;
        OBJ=BOTTLE;
@@ -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;
@@ -40,7 +40,7 @@ L9014:        if((OBJ == BIRD || OBJ == CAGE) && (PROP[BIRD] == 1 || -1-PROP[BIRD] ==
                1))CARRY(BIRD+CAGE-OBJ,LOC);
        CARRY(OBJ,LOC);
        K=LIQ(0);
-       if(OBJ == BOTTLE && K != 0)PLACE[K]= -1;
+       if(OBJ == BOTTLE && K != 0)game.place[K]= -1;
        if(!GSTONE(OBJ) || PROP[OBJ] == 0) return(2009);
        PROP[OBJ]=0;
        PROP[CAVITY]=1;
@@ -61,13 +61,13 @@ 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;
 L9021: K=LIQ(0);
        if(K == OBJ)OBJ=BOTTLE;
-       if(OBJ == BOTTLE && K != 0)PLACE[K]=0;
+       if(OBJ == BOTTLE && K != 0)game.place[K]=0;
        if(OBJ == CAGE && PROP[BIRD] == 1)DROP(BIRD,LOC);
        DROP(OBJ,LOC);
        if(OBJ != BIRD) return(2012);
@@ -121,7 +121,7 @@ L9027:      if(OBJ == VASE && LOC != PLAC[PILLOW]) goto L9028;
 L9028: PROP[VASE]=2;
        if(AT(PILLOW))PROP[VASE]=0;
        PSPEAK(VASE,PROP[VASE]+1);
-       if(PROP[VASE] != 0)FIXED[VASE]= -1;
+       if(PROP[VASE] != 0)game.fixed[VASE]= -1;
         goto L9021;
 }
 
@@ -148,7 +148,7 @@ int attack(FILE *input) {
        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;
@@ -187,7 +187,7 @@ L9126:      if(OBJ == 0)SPK=44;
        MOVE(RUG,K);
        DROP(BLOOD,K);
        for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
-       if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
+       if(game.place[OBJ] == PLAC[DRAGON] || game.place[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
        /*etc*/ ;
        } /* end loop */
        LOC=K;
@@ -232,12 +232,12 @@ int throw(FILE *cmdin) {
        return(attack(cmdin));
 
 L9172: SPK=48;
-       if(randrange(NDWARVES+1) < DFLAG) goto L9175;
+       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;
@@ -246,7 +246,7 @@ L9175:      RSPEAK(SPK);
 /*  This'll teach him to throw the axe at the bear! */
 L9176: SPK=164;
        DROP(AXE,LOC);
-       FIXED[AXE]= -1;
+       game.fixed[AXE]= -1;
        PROP[AXE]=1;
        JUGGLE(BEAR);
         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;
@@ -296,7 +296,7 @@ L9214:      if(OBJ != BEAR) goto L9215;
        if(!HERE(FOOD)) return(2011);
        DSTROY(FOOD);
        PROP[BEAR]=1;
-       FIXED[AXE]=0;
+       game.fixed[AXE]=0;
        PROP[AXE]=0;
        SPK=168;
         return(2011);
@@ -323,7 +323,7 @@ int fill() {
        if(SPK != 107) return(2011);
        PROP[BOTTLE]=MOD(COND[LOC],4)/2*2;
        K=LIQ(0);
-       if(TOTING(BOTTLE))PLACE[K]= -1;
+       if(TOTING(BOTTLE))game.place[K]= -1;
        if(K == OIL)SPK=108;
         return(2011);
 
@@ -332,7 +332,7 @@ L9222:      SPK=29;
        if(LIQLOC(LOC) == 0 || !TOTING(VASE)) return(2011);
        RSPEAK(145);
        PROP[VASE]=2;
-       FIXED[VASE]= -1;
+       game.fixed[VASE]= -1;
         return(discard(true));
 
 L9224: SPK=213;
@@ -340,7 +340,7 @@ L9224:      SPK=213;
        SPK=144;
        K=LIQ(0);
        if(K == 0 || !HERE(BOTTLE)) return(2011);
-       PLACE[K]=0;
+       game.place[K]=0;
        PROP[BOTTLE]=1;
        if(K == OIL)PROP[URN]=1;
        SPK=211+PROP[URN];