#include <stdlib.h>
#include <stdbool.h>
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
#include "funcs.h"
#include "database.h"
/* Light. Applicable only to lamp and urn. */
L8070: if(HERE(LAMP) && PROP[LAMP] == 0 && LIMIT >= 0)OBJ=LAMP;
- if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*100+URN;
- if(OBJ == 0 || OBJ > 100) return(8000);
+ if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*NOBJECTS+URN;
+ if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
L9070: if(OBJ == URN) goto L9073;
if(OBJ != LAMP) return(2011);
/* Extinguish. Lamp, urn, dragon/volcano (nice try). */
L8080: if(HERE(LAMP) && PROP[LAMP] == 1)OBJ=LAMP;
- if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*100+URN;
- if(OBJ == 0 || OBJ > 100) return(8000);
+ if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*NOBJECTS+URN;
+ if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
L9080: if(OBJ == URN) goto L9083;
if(OBJ == LAMP) goto L9086;
/* Inventory. If object, treat same as find. Else report on current burden. */
L8200: SPK=98;
- /* 8201 */ for (I=1; I<=100; I++) {
+ /* 8201 */ for (I=1; I<=NOBJECTS; I++) {
if(I == BEAR || !TOTING(I)) goto L8201;
if(SPK == 98)RSPEAK(99);
BLKLIN=false;
/* Read. Print stuff based on objtxt. Oyster (?) is special case. */
-L8270: for (I=1; I<=100; I++) {
- if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I;
+L8270: for (I=1; I<=NOBJECTS; I++) {
+ if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*NOBJECTS+I;
} /* end loop */
- if(OBJ > 100 || OBJ == 0 || DARK(0)) return(8000);
+ if(OBJ > NOBJECTS || OBJ == 0 || DARK(0)) return(8000);
L9270: if(DARK(0)) goto L5190;
if(OBJTXT[OBJ] == 0 || PROP[OBJ] < 0) return(2011);
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,6);
- SAVARR(DSEEN,6);
- SAVARR(FIXED,100);
+ SAVARR(game.dloc,NDWARVES);
+ SAVARR(game.dseen,NDWARVES);
+ SAVARR(FIXED,NOBJECTS);
SAVARR(HINTED,HNTSIZ);
SAVARR(HINTLC,HNTSIZ);
- SAVARR(LINK,200);
- SAVARR(ODLOC,6);
- SAVARR(PLACE,100);
- SAVARR(PROP,100);
+ 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-MESH*2)+MESH*2;
+ game.zzword=RNDVOC(3,game.zzword);
if(KK > 0) return(8);
RSPEAK(266);
exit(0);
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;
L8330: SPK=228;
K=LOCSND[LOC];
if(K == 0) goto L8332;
- RSPEAK(IABS(K));
+ RSPEAK(labs(K));
if(K < 0) return(2012);
SPK=0;
-L8332: SETPRM(1,ZZWORD-MESH*2,0);
- /* 8335 */ for (I=1; I<=100; I++) {
+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]);
SPK=0;
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);