X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=b9a0dd26a4393487da2d45a4c5a37bc670230c0e;hb=62ee15c892eb1cd1e0333ff8d83888765923e1b4;hp=a1a7cd22060b3765052032ea4901c72d940ad557;hpb=fd10d380df6804dca3b19ea68dc32df2de6090bd;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index a1a7cd2..b9a0dd2 100644
--- a/actions1.c
+++ b/actions1.c
@@ -199,9 +199,9 @@ L9040:	if(OBJ == CLAM || OBJ == OYSTER) goto L9046;
 	if(OBJ == GRATE || OBJ == CHAIN)SPK=31;
 	if(SPK != 31 || !HERE(KEYS)) return(2011);
 	if(OBJ == CHAIN) goto L9048;
-	if(!CLOSNG) goto L9043;
+	if(!game.closng) goto L9043;
 	K=130;
-	if(!PANIC)CLOCK2=15;
+	if(!PANIC)game.clock2=15;
 	PANIC=true;
 	 return(2010);
 
@@ -257,7 +257,7 @@ L9070:	if(OBJ == URN) goto L9073;
 	if(LIMIT < 0) return(2011);
 	PROP[LAMP]=1;
 	RSPEAK(39);
-	if(WZDARK) return(2000);
+	if(game.wzdark) return(2000);
 	 return(2012);
 
 L9073:	SPK=38;
@@ -289,12 +289,12 @@ L9086:	PROP[LAMP]=0;
 /*  Wave.  No effect unless waving rod at fissure or at bird. */
 
 L9090:	if((!TOTING(OBJ)) && (OBJ != ROD || !TOTING(ROD2)))SPK=29;
-	if(OBJ != ROD || !TOTING(OBJ) || (!HERE(BIRD) && (CLOSNG || !AT(FISSUR))))
+	if(OBJ != ROD || !TOTING(OBJ) || (!HERE(BIRD) && (game.closng || !AT(FISSUR))))
 		return(2011);
 	if(HERE(BIRD))SPK=206+MOD(PROP[BIRD],2);
 	if(SPK == 206 && LOC == PLACE[STEPS] && PROP[JADE] < 0) goto L9094;
-	if(CLOSED) return(18999);
-	if(CLOSNG || !AT(FISSUR)) return(2011);
+	if(game.closed) return(18999);
+	if(game.closng || !AT(FISSUR)) return(2011);
 	if(HERE(BIRD))RSPEAK(SPK);
 	PROP[FISSUR]=1-PROP[FISSUR];
 	PSPEAK(FISSUR,2-PROP[FISSUR]);
@@ -399,7 +399,7 @@ L8180:	if(YES(input,22,54,54)) score(1);
 
 L9190:	if(AT(OBJ) || (LIQ(0) == OBJ && AT(BOTTLE)) || K == LIQLOC(LOC) || (OBJ ==
 		DWARF && ATDWRF(LOC) > 0))SPK=94;
-	if(CLOSED)SPK=138;
+	if(game.closed)SPK=138;
 	if(TOTING(OBJ))SPK=24;
 	 return(2011);
 
@@ -409,9 +409,9 @@ L8200:	SPK=98;
 	/* 8201 */ for (I=1; I<=NOBJECTS; I++) {
 	if(I == BEAR || !TOTING(I)) goto L8201;
 	if(SPK == 98)RSPEAK(99);
-	BLKLIN=false;
+	game.blklin=false;
 	PSPEAK(I,-1);
-	BLKLIN=true;
+	game.blklin=true;
 	SPK=0;
 L8201:	/*etc*/ ;
 	} /* end loop */
@@ -425,11 +425,11 @@ L9220:	return(fill());
 
 /*  Blast.  No effect unless you've got dynamite, which is a neat trick! */
 
-L9230:	if(PROP[ROD2] < 0 || !CLOSED) return(2011);
-	BONUS=133;
-	if(LOC == 115)BONUS=134;
-	if(HERE(ROD2))BONUS=135;
-	RSPEAK(BONUS);
+L9230:	if(PROP[ROD2] < 0 || !game.closed) return(2011);
+	game.bonus=133;
+	if(LOC == 115)game.bonus=134;
+	if(HERE(ROD2))game.bonus=135;
+	RSPEAK(game.bonus);
 	 score(0);
 
 /*  Score.  Call scoring routine but tell it to return. */
@@ -468,8 +468,8 @@ L8252:	FOOBAR=K;
 /*  Brief.  Intransitive only.  Suppress long descriptions after first time. */
 
 L8260:	SPK=156;
-	ABBNUM=10000;
-	DETAIL=3;
+	game.abbnum=10000;
+	game.detail=3;
 	 return(2011);
 
 /*  Read.  Print stuff based on objtxt.  Oyster (?) is special case. */
@@ -492,7 +492,7 @@ L9275:	CLSHNT=YES(input,192,193,54);
 
 L9280:	if(OBJ == MIRROR)SPK=148;
 	if(OBJ == VASE && PROP[VASE] == 0) goto L9282;
-	if(OBJ != MIRROR || !CLOSED) return(2011);
+	if(OBJ != MIRROR || !game.closed) return(2011);
 	SPK=197;
 	 return(18999);
 
@@ -504,7 +504,7 @@ L9282:	SPK=198;
 
 /*  Wake.  Only use is to disturb the dwarves. */
 
-L9290:	if(OBJ != DWARF || !CLOSED) return(2011);
+L9290:	if(OBJ != DWARF || !game.closed) return(2011);
 	SPK=199;
 	 return(18999);
 
@@ -533,28 +533,28 @@ L8305:	DATIME(&I,&K);
  *  suspended or resumed are guaranteed to match.  If unsure whether a value
  *  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(ABBNUM,BLKLIN,BONUS,CLOCK1,CLOCK2,CLOSED,CLOSNG);
-	SAVWDS(DETAIL,DFLAG,DKILL,DTOTAL,FOOBAR,HOLDNG,IWEST);
+	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,OLDLC2,OLDLOC,OLDOBJ,PANIC,SAVED,SETUP);
+	SAVWDS(OBJ,game.oldlc2,game.oldloc,OLDOBJ,PANIC,SAVED,SETUP);
 	SAVWDS(SPK,TALLY,THRESH,TRNDEX,TRNLUZ,TURNS,OBJTXT[OYSTER]);
-	SAVWDS(VERB,WD1,WD1X,WD2,WZDARK,ZZWORD,OBJSND[BIRD]);
+	SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
 	SAVWDS(OBJTXT[SIGN],CLSHNT,NOVICE,K,K,K,K);
 	SAVARR(ABB,LOCSIZ);
 	SAVARR(ATLOC,LOCSIZ);
-	SAVARR(DLOC,6);
-	SAVARR(DSEEN,6);
+	SAVARR(game.dloc,NDWARVES);
+	SAVARR(game.dseen,NDWARVES);
 	SAVARR(FIXED,NOBJECTS);
 	SAVARR(HINTED,HNTSIZ);
 	SAVARR(HINTLC,HNTSIZ);
-	SAVARR(LINK,200);
-	SAVARR(ODLOC,6);
+	SAVARR(LINK,NOBJECTS*2);
+	SAVARR(game.odloc,NDWARVES);
 	SAVARR(PLACE,NOBJECTS);
 	SAVARR(PROP,NOBJECTS);
 	SAVWRD(KK,K);
 	if(K != 0) goto L8318;
 	K=NUL;
-	ZZWORD=RNDVOC(3,ZZWORD);
+	game.zzword=RNDVOC(3,game.zzword);
 	if(KK > 0) return(8);
 	RSPEAK(266);
 	exit(0);
@@ -585,8 +585,8 @@ L8320:	if(PROP[RUG] != 2)SPK=224;
 L9320:	if(OBJ != RUG) return(2011);
 	SPK=223;
 	if(PROP[RUG] != 2) return(2011);
-	OLDLC2=OLDLOC;
-	OLDLOC=LOC;
+	game.oldlc2=game.oldloc;
+	game.oldloc=LOC;
 	NEWLOC=PLACE[RUG]+FIXED[RUG]-LOC;
 	SPK=226;
 	if(PROP[SAPPH] >= 0)SPK=227;
@@ -601,7 +601,7 @@ L8330:	SPK=228;
 	RSPEAK(labs(K));
 	if(K < 0) return(2012);
 	SPK=0;
-L8332:	SETPRM(1,ZZWORD,0);
+L8332:	SETPRM(1,game.zzword,0);
 	/* 8335 */ for (I=1; I<=NOBJECTS; I++) {
 	if(!HERE(I) || OBJSND[I] == 0 || PROP[I] < 0) goto L8335;
 	PSPEAK(I,OBJSND[I]+PROP[I]);
@@ -617,7 +617,7 @@ L8340:	if(!AT(RESER) && LOC != FIXED[RESER]-1) return(2011);
 	PSPEAK(RESER,PROP[RESER]+1);
 	PROP[RESER]=1-PROP[RESER];
 	if(AT(RESER)) return(2012);
-	OLDLC2=LOC;
+	game.oldlc2=LOC;
 	NEWLOC=0;
 	RSPEAK(241);
 	 return(2);