X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=d9fa2e5e90fe25d3a6bf77a0e6aab3b268bc4460;hb=c68b92d9dab2976bcee4e695be459a0a3d0577e1;hp=6a751d7cf5f55efacdfae1d2b517dee8695f1dc0;hpb=07c0020a7aaa0ab34ee0e4f6e3a9ae0e1fe06c25;p=open-adventure.git diff --git a/actions1.c b/actions1.c index 6a751d7..d9fa2e5 100644 --- a/actions1.c +++ b/actions1.c @@ -536,9 +536,9 @@ 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); @@ -554,7 +554,7 @@ L8305: DATIME(&I,&K); 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);