Magic-number elimination.

[open-adventure.git] / actions1.c

diff --git a/actions1.c b/actions1.c
index 79c0ea719c497ac138efb711af7b5c68beab3243..8a7ccadf0350ef24403c1c6f50a43dec5de02b0a 100644 (file)
--- a/actions1.c
+++ b/actions1.c
@@ -1,9 +1,8 @@
 #include <stdlib.h>
 #include <stdbool.h>
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
 #include "funcs.h"
+#include "database.h"
 
 /* This stuff was broken off as part of an effort to get the main program
  * to compile without running out of memory.  We're called with a number
@@ -249,8 +248,8 @@ L9049:      SPK=172;
 /*  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);
@@ -270,8 +269,8 @@ L9073:      SPK=38;
 /*  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;
@@ -407,7 +406,7 @@ L9190:      if(AT(OBJ) || (LIQ(0) == OBJ && AT(BOTTLE)) || K == LIQLOC(LOC) || (OBJ =
 /*  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;
@@ -475,10 +474,10 @@ L8260:    SPK=156;
 
 /*  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);
@@ -522,7 +521,7 @@ L8300:      SPK=201;
 /*  This next part is shared with the "resume" code.  The two cases are
  *  distinguished by the value of kk (-1 for suspend, +1 for resume). */
 
-L8305: DATIME(I,K);
+L8305: DATIME(&I,&K);
        K=I+650*K;
        SAVWRD(KK,K);
        K=VRSION;
@@ -543,19 +542,19 @@ L8305:    DATIME(I,K);
        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(DLOC,NDWARVES);
+       SAVARR(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(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;
+       ZZWORD=RNDVOC(3,ZZWORD);
        if(KK > 0) return(8);
        RSPEAK(266);
        exit(0);
@@ -599,11 +598,11 @@ L9320:    if(OBJ != RUG) return(2011);
 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,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;