X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=d9fa2e5e90fe25d3a6bf77a0e6aab3b268bc4460;hb=924157fa9f3dd5c62a4a9c7d9621aae9d8a418d3;hp=8a7ccadf0350ef24403c1c6f50a43dec5de02b0a;hpb=978168523abcc3e4f06c23df57dc47541cd995ca;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index 8a7ccad..d9fa2e5 100644
--- a/actions1.c
+++ b/actions1.c
@@ -536,25 +536,25 @@ L8305:	DATIME(&I,&K);
 	SAVWDS(ABBNUM,BLKLIN,BONUS,CLOCK1,CLOCK2,CLOSED,CLOSNG);
 	SAVWDS(DETAIL,DFLAG,DKILL,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,WZDARK,game.zzword,OBJSND[BIRD]);
 	SAVWDS(OBJTXT[SIGN],CLSHNT,NOVICE,K,K,K,K);
 	SAVARR(ABB,LOCSIZ);
 	SAVARR(ATLOC,LOCSIZ);
-	SAVARR(DLOC,NDWARVES);
-	SAVARR(DSEEN,NDWARVES);
+	SAVARR(game.dloc,NDWARVES);
+	SAVARR(game.dseen,NDWARVES);
 	SAVARR(FIXED,NOBJECTS);
 	SAVARR(HINTED,HNTSIZ);
 	SAVARR(HINTLC,HNTSIZ);
 	SAVARR(LINK,NOBJECTS*2);
-	SAVARR(ODLOC,NDWARVES);
+	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);