Move more globals into the state structure.

This commit is contained in:
Eric S. Raymond 2017-05-23 19:40:34 -04:00
parent 42189d79d7
commit fa1f859162
6 changed files with 68 additions and 59 deletions

View file

@ -162,8 +162,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];
@ -476,7 +476,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
@ -497,10 +497,10 @@ L8305: DATIME(I,K);
SAVWDS(game.abbnum,game.blklin,game.bonus,game.clock1,game.clock2,game.closed,game.closng);
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,OLDLC2,OLDLOC,OLDOBJ,PANIC,SAVED,SETUP);
SAVWDS(OBJ,game.oldlc2,game.oldloc,game.oldobj,game.panic,game.saved,SETUP);
SAVWDS(SPK,TALLY,THRESH,TRNDEX,TRNLUZ,TURNS,OBJTXT[OYSTER]);
SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,ZZWORD,OBJSND[BIRD]);
SAVWDS(OBJTXT[SIGN],CLSHNT,NOVICE,K,K,K,K);
SAVWDS(OBJTXT[SIGN],CLSHNT,game.novice,K,K,K,K);
SAVARR(ABB,LOCSIZ);
SAVARR(ATLOC,LOCSIZ);
SAVARR(DLOC,6);
@ -546,8 +546,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;
game.newloc=PLACE[RUG]+FIXED[RUG]-LOC;
SPK=226;
if(PROP[SAPPH] >= 0)SPK=227;
@ -578,7 +578,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;
game.newloc=0;
RSPEAK(241);
return(2);