archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Begin gathering saveable game state into a structure. Not yet complete.

Browse source 
No logic changes.  A bunch of globals turn into fields (with the same names
except for lowercasing) in struct game_t.

Eventually this will allow drastic simplification of the save/load logic.
This commit is contained in:
Eric S. Raymond 2017-05-23 18:47:04 -04:00
parent dc9d9e467b
commit 42189d79d7
11 changed files with 260 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

64
actions1.c
View file

@ -94,8 +94,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;
@ -160,9 +160,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);
@ -208,17 +208,17 @@ 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*100+URN;
if(OBJ == 0 || OBJ > 100) 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(WZDARK) return(2000);
if(game.wzdark) return(2000);
return(2012);
L9073: SPK=38;
@ -250,12 +250,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]);
@ -360,7 +360,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);
@ -370,9 +370,9 @@ L8200: SPK=98;
/* 8201 */ for (I=1; I<=100; 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 */
@ -386,11 +386,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. */
@ -407,13 +407,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. */
@ -429,8 +429,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. */
@ -453,7 +453,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);
@ -465,7 +465,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);
@ -494,12 +494,12 @@ 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(KNFLOC,LIMIT,LL,LMWARN,LOC,NEWLOC,NUMDIE);
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(SPK,TALLY,THRESH,TRNDEX,TRNLUZ,TURNS,OBJTXT[OYSTER]);
SAVWDS(VERB,WD1,WD1X,WD2,WZDARK,ZZWORD,OBJSND[BIRD]);
SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,ZZWORD,OBJSND[BIRD]);
SAVWDS(OBJTXT[SIGN],CLSHNT,NOVICE,K,K,K,K);
SAVARR(ABB,LOCSIZ);
SAVARR(ATLOC,LOCSIZ);
@ -548,7 +548,7 @@ L9320: if(OBJ != RUG) return(2011);
if(PROP[RUG] != 2) return(2011);
OLDLC2=OLDLOC;
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);
@ -579,7 +579,7 @@ L8340: if(!AT(RESER) && LOC != FIXED[RESER]-1) return(2011);
PROP[RESER]=1-PROP[RESER];
if(AT(RESER)) return(2012);
OLDLC2=LOC;
NEWLOC=0;
game.newloc=0;
RSPEAK(241);
return(2);