Pull more globals into the game state block.

[open-adventure.git] / actions1.c

diff --git a/actions1.c b/actions1.c
index b9a0dd26a4393487da2d45a4c5a37bc670230c0e..3fabfbdefd91b792c222e91cb633ca7e2f581de6 100644 (file)
--- a/actions1.c
+++ b/actions1.c
@@ -133,8 +133,8 @@ L5110:      if(K == DWARF && ATDWRF(LOC) > 0) goto L5010;
 L5120: if(OBJ != PLANT || !AT(PLANT2) || PROP[PLANT2] == 0) goto L5130;
        OBJ=PLANT2;
         goto L5010;
-L5130: if(OBJ != KNIFE || KNFLOC != LOC) goto L5140;
-       KNFLOC= -1;
+L5130: if(OBJ != KNIFE || game.knfloc != LOC) goto L5140;
+       game.knfloc= -1;
        SPK=116;
         return(2011);
 L5140: if(OBJ != ROD || !HERE(ROD2)) goto L5190;
@@ -201,8 +201,8 @@ L9040:      if(OBJ == CLAM || OBJ == OYSTER) goto L9046;
        if(OBJ == CHAIN) goto L9048;
        if(!game.closng) goto L9043;
        K=130;
-       if(!PANIC)game.clock2=15;
-       PANIC=true;
+       if(!game.panic)game.clock2=15;
+       game.panic=true;
         return(2010);
 
 L9043: K=34+PROP[GRATE];
@@ -247,14 +247,14 @@ L9049:    SPK=172;
 
 /*  Light.  Applicable only to lamp and urn. */
 
-L8070: if(HERE(LAMP) && PROP[LAMP] == 0 && LIMIT >= 0)OBJ=LAMP;
+L8070: if(HERE(LAMP) && PROP[LAMP] == 0 && game.limit >= 0)OBJ=LAMP;
        if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*NOBJECTS+URN;
        if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
 
 L9070: if(OBJ == URN) goto L9073;
        if(OBJ != LAMP) return(2011);
        SPK=184;
-       if(LIMIT < 0) return(2011);
+       if(game.limit < 0) return(2011);
        PROP[LAMP]=1;
        RSPEAK(39);
        if(game.wzdark) return(2000);
@@ -302,7 +302,7 @@ L9090:      if((!TOTING(OBJ)) && (OBJ != ROD || !TOTING(ROD2)))SPK=29;
 
 L9094: DROP(JADE,LOC);
        PROP[JADE]=0;
-       TALLY=TALLY-1;
+       game.tally=game.tally-1;
        SPK=208;
         return(2011);
 
@@ -381,7 +381,7 @@ L9160:      if(OBJ != LAMP)SPK=76;
        DSTROY(URN);
        DROP(AMBER,LOC);
        PROP[AMBER]=1;
-       TALLY=TALLY-1;
+       game.tally=game.tally-1;
        DROP(CAVITY,LOC);
        SPK=216;
         return(2011);
@@ -436,7 +436,7 @@ L9230:      if(PROP[ROD2] < 0 || !game.closed) return(2011);
 
 L8240: score(-1);
        SETPRM(1,SCORE,MXSCOR);
-       SETPRM(3,TURNS,TURNS);
+       SETPRM(3,game.turns,game.turns);
        RSPEAK(259);
         return(2012);
 
@@ -446,13 +446,13 @@ L8240:    score(-1);
 
 L8250: K=VOCAB(WD1,3);
        SPK=42;
-       if(FOOBAR == 1-K) goto L8252;
-       if(FOOBAR != 0)SPK=151;
+       if(game.foobar == 1-K) goto L8252;
+       if(game.foobar != 0)SPK=151;
         return(2011);
 
-L8252: FOOBAR=K;
+L8252: game.foobar=K;
        if(K != 4) return(2009);
-       FOOBAR=0;
+       game.foobar=0;
        if(PLACE[EGGS] == PLAC[EGGS] || (TOTING(EGGS) && LOC == PLAC[EGGS])) 
                return(2011);
 /*  Bring back troll if we steal the eggs back from him before crossing. */
@@ -481,11 +481,11 @@ L8270:    for (I=1; I<=NOBJECTS; I++) {
 
 L9270: if(DARK(0)) goto L5190;
        if(OBJTXT[OBJ] == 0 || PROP[OBJ] < 0) return(2011);
-       if(OBJ == OYSTER && !CLSHNT) goto L9275;
+       if(OBJ == OYSTER && !game.clshnt) goto L9275;
        PSPEAK(OBJ,OBJTXT[OBJ]+PROP[OBJ]);
         return(2012);
 
-L9275: CLSHNT=YES(input,192,193,54);
+L9275: game.clshnt=YES(input,192,193,54);
         return(2012);
 
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
@@ -515,7 +515,7 @@ L9290:      if(OBJ != DWARF || !game.closed) return(2011);
 L8300: SPK=201;
        RSPEAK(260);
        if(!YES(input,200,54,54)) return(2012);
-       SAVED=SAVED+5;
+       game.saved=game.saved+5;
        KK= -1;
 
 /*  This next part is shared with the "resume" code.  The two cases are
@@ -534,13 +534,13 @@ L8305:    DATIME(&I,&K);
  *  needs to be saved, include it.  Overkill can't hurt.  Pad the last savwds
  *  with junk variables to bring it up to 7 values. */
        SAVWDS(game.abbnum,game.blklin,game.bonus,game.clock1,game.clock2,game.closed,game.closng);
-       SAVWDS(game.detail,DFLAG,game.dkill,game.dtotal,FOOBAR,HOLDNG,IWEST);
-       SAVWDS(KNFLOC,LIMIT,LL,LMWARN,LOC,NEWLOC,NUMDIE);
-       SAVWDS(OBJ,game.oldlc2,game.oldloc,OLDOBJ,PANIC,SAVED,SETUP);
-       SAVWDS(SPK,TALLY,THRESH,TRNDEX,TRNLUZ,TURNS,OBJTXT[OYSTER]);
+       SAVWDS(game.detail,game.dflag,game.dkill,game.dtotal,game.foobar,game.holdng,game.iwest);
+       SAVWDS(game.knfloc,game.limit,LL,game.lmwarn,LOC,game.newloc,game.numdie);
+       SAVWDS(OBJ,game.oldlc2,game.oldloc,game.oldobj,game.panic,game.saved,SETUP);
+       SAVWDS(SPK,game.tally,game.thresh,game.trndex,game.trnluz,game.turns,OBJTXT[OYSTER]);
        SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
-       SAVWDS(OBJTXT[SIGN],CLSHNT,NOVICE,K,K,K,K);
-       SAVARR(ABB,LOCSIZ);
+       SAVWDS(OBJTXT[SIGN],game.clshnt,game.novice,K,K,K,K);
+       SAVARR(game.abbrev,LOCSIZ);
        SAVARR(ATLOC,LOCSIZ);
        SAVARR(game.dloc,NDWARVES);
        SAVARR(game.dseen,NDWARVES);
@@ -562,7 +562,7 @@ L8305:      DATIME(&I,&K);
 /*  Resume.  Read a suspended game back from a file. */
 
 L8310: KK=1;
-       if(LOC == 1 && ABB[1] == 1) goto L8305;
+       if(LOC == 1 && game.abbrev[1] == 1) goto L8305;
        RSPEAK(268);
        if(!YES(input,200,54,54)) return(2012);
         goto L8305;
@@ -587,7 +587,7 @@ L9320:      if(OBJ != RUG) return(2011);
        if(PROP[RUG] != 2) return(2011);
        game.oldlc2=game.oldloc;
        game.oldloc=LOC;
-       NEWLOC=PLACE[RUG]+FIXED[RUG]-LOC;
+       game.newloc=PLACE[RUG]+FIXED[RUG]-LOC;
        SPK=226;
        if(PROP[SAPPH] >= 0)SPK=227;
        RSPEAK(SPK);
@@ -618,7 +618,7 @@ L8340:      if(!AT(RESER) && LOC != FIXED[RESER]-1) return(2011);
        PROP[RESER]=1-PROP[RESER];
        if(AT(RESER)) return(2012);
        game.oldlc2=LOC;
-       NEWLOC=0;
+       game.newloc=0;
        RSPEAK(241);
         return(2);