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

Abstract out NOBJECTS (formerly magic number 100).

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-06 10:44:25 -04:00
parent 00c0da471d
commit fd10d380df
6 changed files with 88 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

24
actions1.c
View file

@ -248,8 +248,8 @@ L9049: SPK=172;
/* Light. Applicable only to lamp and urn. */ /* 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 && LIMIT >= 0)OBJ=LAMP;
if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*100+URN; if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*NOBJECTS+URN;
if(OBJ == 0 || OBJ > 100) return(8000); if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
L9070: if(OBJ == URN) goto L9073; L9070: if(OBJ == URN) goto L9073;
if(OBJ != LAMP) return(2011); if(OBJ != LAMP) return(2011);
@ -269,8 +269,8 @@ L9073: SPK=38;
/* Extinguish. Lamp, urn, dragon/volcano (nice try). */ /* Extinguish. Lamp, urn, dragon/volcano (nice try). */
L8080: if(HERE(LAMP) && PROP[LAMP] == 1)OBJ=LAMP; L8080: if(HERE(LAMP) && PROP[LAMP] == 1)OBJ=LAMP;
if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*100+URN; if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*NOBJECTS+URN;
if(OBJ == 0 || OBJ > 100) return(8000); if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
L9080: if(OBJ == URN) goto L9083; L9080: if(OBJ == URN) goto L9083;
if(OBJ == LAMP) goto L9086; if(OBJ == LAMP) goto L9086;
@ -406,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. */ /* Inventory. If object, treat same as find. Else report on current burden. */
L8200: SPK=98; 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(I == BEAR || !TOTING(I)) goto L8201;
if(SPK == 98)RSPEAK(99); if(SPK == 98)RSPEAK(99);
BLKLIN=false; BLKLIN=false;
@ -474,10 +474,10 @@ L8260: SPK=156;
/* Read. Print stuff based on objtxt. Oyster (?) is special case. */ /* Read. Print stuff based on objtxt. Oyster (?) is special case. */
L8270: for (I=1; I<=100; I++) { L8270: for (I=1; I<=NOBJECTS; I++) {
if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I; if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*NOBJECTS+I;
} /* end loop */ } /* 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; L9270: if(DARK(0)) goto L5190;
if(OBJTXT[OBJ] == 0 || PROP[OBJ] < 0) return(2011); if(OBJTXT[OBJ] == 0 || PROP[OBJ] < 0) return(2011);
@ -544,13 +544,13 @@ L8305: DATIME(&I,&K);
SAVARR(ATLOC,LOCSIZ); SAVARR(ATLOC,LOCSIZ);
SAVARR(DLOC,6); SAVARR(DLOC,6);
SAVARR(DSEEN,6); SAVARR(DSEEN,6);
SAVARR(FIXED,100); SAVARR(FIXED,NOBJECTS);
SAVARR(HINTED,HNTSIZ); SAVARR(HINTED,HNTSIZ);
SAVARR(HINTLC,HNTSIZ); SAVARR(HINTLC,HNTSIZ);
SAVARR(LINK,200); SAVARR(LINK,200);
SAVARR(ODLOC,6); SAVARR(ODLOC,6);
SAVARR(PLACE,100); SAVARR(PLACE,NOBJECTS);
SAVARR(PROP,100); SAVARR(PROP,NOBJECTS);
SAVWRD(KK,K); SAVWRD(KK,K);
if(K != 0) goto L8318; if(K != 0) goto L8318;
K=NUL; K=NUL;
@ -602,7 +602,7 @@ L8330: SPK=228;
if(K < 0) return(2012); if(K < 0) return(2012);
SPK=0; SPK=0;
L8332: SETPRM(1,ZZWORD,0); L8332: SETPRM(1,ZZWORD,0);
/* 8335 */ for (I=1; I<=100; I++) { /* 8335 */ for (I=1; I<=NOBJECTS; I++) {
if(!HERE(I) || OBJSND[I] == 0 || PROP[I] < 0) goto L8335; if(!HERE(I) || OBJSND[I] == 0 || PROP[I] < 0) goto L8335;
PSPEAK(I,OBJSND[I]+PROP[I]); PSPEAK(I,OBJSND[I]+PROP[I]);
SPK=0; SPK=0;

34
actions2.c
View file

@ -89,7 +89,7 @@ L9023: if(!(GSTONE(OBJ) && AT(CAVITY) && PROP[CAVITY] != 0)) goto L9024;
K=2-PROP[RUG]; K=2-PROP[RUG];
PROP[RUG]=K; PROP[RUG]=K;
if(K == 2)K=PLAC[SAPPH]; if(K == 2)K=PLAC[SAPPH];
MOVE(RUG+100,K); MOVE(RUG+NOBJECTS,K);
goto L9021; goto L9021;
L9024: if(OBJ != COINS || !HERE(VEND)) goto L9025; L9024: if(OBJ != COINS || !HERE(VEND)) goto L9025;
@ -107,9 +107,9 @@ L9025: if(OBJ != BIRD || !AT(DRAGON) || PROP[DRAGON] != 0) goto L9026;
L9026: if(OBJ != BEAR || !AT(TROLL)) goto L9027; L9026: if(OBJ != BEAR || !AT(TROLL)) goto L9027;
RSPEAK(163); RSPEAK(163);
MOVE(TROLL,0); MOVE(TROLL,0);
MOVE(TROLL+100,0); MOVE(TROLL+NOBJECTS,0);
MOVE(TROLL2,PLAC[TROLL]); MOVE(TROLL2,PLAC[TROLL]);
MOVE(TROLL2+100,FIXD[TROLL]); MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM); JUGGLE(CHASM);
PROP[TROLL]=2; PROP[TROLL]=2;
goto L9021; goto L9021;
@ -133,19 +133,19 @@ int attack(FILE *input) {
I=ATDWRF(LOC); I=ATDWRF(LOC);
if(OBJ != 0) goto L9124; if(OBJ != 0) goto L9124;
if(I > 0)OBJ=DWARF; if(I > 0)OBJ=DWARF;
if(HERE(SNAKE))OBJ=OBJ*100+SNAKE; if(HERE(SNAKE))OBJ=OBJ*NOBJECTS+SNAKE;
if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*100+DRAGON; if(AT(DRAGON) && PROP[DRAGON] == 0)OBJ=OBJ*NOBJECTS+DRAGON;
if(AT(TROLL))OBJ=OBJ*100+TROLL; if(AT(TROLL))OBJ=OBJ*NOBJECTS+TROLL;
if(AT(OGRE))OBJ=OBJ*100+OGRE; if(AT(OGRE))OBJ=OBJ*NOBJECTS+OGRE;
if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*100+BEAR; if(HERE(BEAR) && PROP[BEAR] == 0)OBJ=OBJ*NOBJECTS+BEAR;
if(OBJ > 100) return(8000); if(OBJ > NOBJECTS) return(8000);
if(OBJ != 0) goto L9124; if(OBJ != 0) goto L9124;
/* CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */ /* CAN'T ATTACK BIRD OR MACHINE BY THROWING AXE. */
if(HERE(BIRD) && VERB != THROW)OBJ=BIRD; if(HERE(BIRD) && VERB != THROW)OBJ=BIRD;
if(HERE(VEND) && VERB != THROW)OBJ=OBJ*100+VEND; if(HERE(VEND) && VERB != THROW)OBJ=OBJ*NOBJECTS+VEND;
/* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */ /* CLAM AND OYSTER BOTH TREATED AS CLAM FOR INTRANSITIVE CASE; NO HARM DONE. */
if(HERE(CLAM) || HERE(OYSTER))OBJ=100*OBJ+CLAM; if(HERE(CLAM) || HERE(OYSTER))OBJ=NOBJECTS*OBJ+CLAM;
if(OBJ > 100) return(8000); if(OBJ > NOBJECTS) return(8000);
L9124: if(OBJ == BIRD) { L9124: if(OBJ == BIRD) {
SPK=137; SPK=137;
if(CLOSED) return(2011); if(CLOSED) return(2011);
@ -181,12 +181,12 @@ L9126: if(OBJ == 0)SPK=44;
PROP[DRAGON]=1; PROP[DRAGON]=1;
PROP[RUG]=0; PROP[RUG]=0;
K=(PLAC[DRAGON]+FIXD[DRAGON])/2; K=(PLAC[DRAGON]+FIXD[DRAGON])/2;
MOVE(DRAGON+100,-1); MOVE(DRAGON+NOBJECTS,-1);
MOVE(RUG+100,0); MOVE(RUG+NOBJECTS,0);
MOVE(DRAGON,K); MOVE(DRAGON,K);
MOVE(RUG,K); MOVE(RUG,K);
DROP(BLOOD,K); DROP(BLOOD,K);
for (OBJ=1; OBJ<=100; OBJ++) { for (OBJ=1; OBJ<=NOBJECTS; OBJ++) {
if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K); if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
/*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
@ -259,9 +259,9 @@ L9178: SPK=159;
/* Snarf a treasure for the troll. */ /* Snarf a treasure for the troll. */
DROP(OBJ,0); DROP(OBJ,0);
MOVE(TROLL,0); MOVE(TROLL,0);
MOVE(TROLL+100,0); MOVE(TROLL+NOBJECTS,0);
DROP(TROLL2,PLAC[TROLL]); DROP(TROLL2,PLAC[TROLL]);
DROP(TROLL2+100,FIXD[TROLL]); DROP(TROLL2+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM); JUGGLE(CHASM);
return(2011); return(2011);
} }

48
compile.c
View file

@ -14,6 +14,9 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
/* hard limit, will be propagated to database.h */
#define NOBJECTS 100
const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0}; const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0};
/* Rendered from the now-gone MPINIT() function */ /* Rendered from the now-gone MPINIT() function */
const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 123, 124, 125, 126, 83}; const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 123, 124, 125, 126, 83};
@ -32,11 +35,11 @@ long CLSSES;
long TRNVLS; long TRNVLS;
long TABNDX; long TABNDX;
long HNTMAX; long HNTMAX;
long PTEXT[101]; long PTEXT[NOBJECTS+1];
long RTEXT[RTXSIZ + 1]; long RTEXT[RTXSIZ + 1];
long CTEXT[CLSMAX + 1]; long CTEXT[CLSMAX + 1];
long OBJSND[101]; long OBJSND[NOBJECTS+1];
long OBJTXT[101]; long OBJTXT[NOBJECTS+1];
long STEXT[LOCSIZ + 1]; long STEXT[LOCSIZ + 1];
long LTEXT[LOCSIZ + 1]; long LTEXT[LOCSIZ + 1];
long COND[LOCSIZ + 1]; long COND[LOCSIZ + 1];
@ -49,8 +52,8 @@ long TRNVAL[TRNSIZ + 1];
long TRAVEL[TRVSIZ + 1]; long TRAVEL[TRVSIZ + 1];
long KTAB[TABSIZ + 1]; long KTAB[TABSIZ + 1];
long ATAB[TABSIZ + 1]; long ATAB[TABSIZ + 1];
long PLAC[101]; long PLAC[NOBJECTS+1];
long FIXD[101]; long FIXD[NOBJECTS+1];
long ACTSPK[VRBSIZ + 1]; long ACTSPK[VRBSIZ + 1];
long HINTS[HNTSIZ + 1][5]; long HINTS[HNTSIZ + 1][5];
@ -258,11 +261,11 @@ int read_database(FILE* database) {
* section 14. We also clear COND (see description of section 9 for details). */ * section 14. We also clear COND (see description of section 9 for details). */
for (int I=1; I<=300; I++) { for (int I=1; I<=300; I++) {
if(I <= 100) PTEXT[I] = 0; if(I <= NOBJECTS) PTEXT[I] = 0;
if(I <= RTXSIZ) RTEXT[I] = 0; if(I <= RTXSIZ) RTEXT[I] = 0;
if(I <= CLSMAX) CTEXT[I] = 0; if(I <= CLSMAX) CTEXT[I] = 0;
if(I <= 100) OBJSND[I] = 0; if(I <= NOBJECTS) OBJSND[I] = 0;
if(I <= 100) OBJTXT[I] = 0; if(I <= NOBJECTS) OBJTXT[I] = 0;
if(I > LOCSIZ) break; if(I > LOCSIZ) break;
STEXT[I] = 0; STEXT[I] = 0;
LTEXT[I] = 0; LTEXT[I] = 0;
@ -351,7 +354,7 @@ void read_messages(FILE* database, long SECT)
} }
if(SECT == 5) if(SECT == 5)
{ {
if(LOC > 0 && LOC <= 100)PTEXT[LOC]=LINUSE; if(LOC > 0 && LOC <= NOBJECTS)PTEXT[LOC]=LINUSE;
continue; continue;
} }
if(LOC > LOCSIZ)BUG(10); if(LOC > LOCSIZ)BUG(10);
@ -491,13 +494,15 @@ void read_sound_text(FILE* database)
/* Finish constructing internal data format */ /* Finish constructing internal data format */
/* Having read in the database, certain things are now constructed. PROPS are /* Having read in the database, certain things are now constructed.
* set to zero. We finish setting up COND by checking for forced-motion travel * PROPS are set to zero. We finish setting up COND by checking for
* entries. The PLAC and FIXD arrays are used to set up ATLOC(N) as the first * forced-motion travel entries. The PLAC and FIXD arrays are used
* object at location N, and LINK(OBJ) as the next object at the same location * to set up ATLOC(N) as the first object at location N, and
* as OBJ. (OBJ>100 indicates that FIXED(OBJ-100)=LOC; LINK(OBJ) is still the * LINK(OBJ) as the next object at the same location as OBJ.
* correct link to use.) ABB is zeroed; it controls whether the abbreviated * (OBJ>NOBJECTS indicates that FIXED(OBJ-NOBJECTS)=LOC; LINK(OBJ) is
* description is printed. Counts modulo 5 unless "LOOK" is used. */ * still the correct link to use.) ABB is zeroed; it controls
* whether the abbreviated description is printed. Counts modulo 5
* unless "LOOK" is used. */
void write_0d(FILE* c_file, FILE* header_file, long single, char* varname) void write_0d(FILE* c_file, FILE* header_file, long single, char* varname)
{ {
@ -541,6 +546,7 @@ void write_hints(FILE* c_file, FILE* header_file, long matrix[][5], long dim1, l
void write_files(FILE* c_file, FILE* header_file) void write_files(FILE* c_file, FILE* header_file)
{ {
// preprocessor defines for the header // preprocessor defines for the header
fprintf(header_file, "#define NOBJECTS %d\n", NOBJECTS);
fprintf(header_file, "#define RTXSIZ 277\n"); fprintf(header_file, "#define RTXSIZ 277\n");
fprintf(header_file, "#define CLSMAX 12\n"); fprintf(header_file, "#define CLSMAX 12\n");
fprintf(header_file, "#define LOCSIZ 185\n"); fprintf(header_file, "#define LOCSIZ 185\n");
@ -563,11 +569,11 @@ void write_files(FILE* c_file, FILE* header_file)
write_0d(c_file, header_file, TRNVLS, "TRNVLS"); write_0d(c_file, header_file, TRNVLS, "TRNVLS");
write_0d(c_file, header_file, TABNDX, "TABNDX"); write_0d(c_file, header_file, TABNDX, "TABNDX");
write_0d(c_file, header_file, HNTMAX, "HNTMAX"); write_0d(c_file, header_file, HNTMAX, "HNTMAX");
write_1d(c_file, header_file, PTEXT, 100 + 1, "PTEXT"); write_1d(c_file, header_file, PTEXT, NOBJECTS + 1, "PTEXT");
write_1d(c_file, header_file, RTEXT, RTXSIZ + 1, "RTEXT"); write_1d(c_file, header_file, RTEXT, RTXSIZ + 1, "RTEXT");
write_1d(c_file, header_file, CTEXT, CLSMAX + 1, "CTEXT"); write_1d(c_file, header_file, CTEXT, CLSMAX + 1, "CTEXT");
write_1d(c_file, header_file, OBJSND, 100 + 1, "OBJSND"); write_1d(c_file, header_file, OBJSND, NOBJECTS + 1, "OBJSND");
write_1d(c_file, header_file, OBJTXT, 100 + 1, "OBJTXT"); write_1d(c_file, header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
write_1d(c_file, header_file, STEXT, LOCSIZ + 1, "STEXT"); write_1d(c_file, header_file, STEXT, LOCSIZ + 1, "STEXT");
write_1d(c_file, header_file, LTEXT, LOCSIZ + 1, "LTEXT"); write_1d(c_file, header_file, LTEXT, LOCSIZ + 1, "LTEXT");
write_1d(c_file, header_file, COND, LOCSIZ + 1, "COND"); write_1d(c_file, header_file, COND, LOCSIZ + 1, "COND");
@ -580,8 +586,8 @@ void write_files(FILE* c_file, FILE* header_file)
write_1d(c_file, header_file, TRAVEL, TRVSIZ + 1, "TRAVEL"); write_1d(c_file, header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
write_1d(c_file, header_file, KTAB, TABSIZ + 1, "KTAB"); write_1d(c_file, header_file, KTAB, TABSIZ + 1, "KTAB");
write_1d(c_file, header_file, ATAB, TABSIZ + 1, "ATAB"); write_1d(c_file, header_file, ATAB, TABSIZ + 1, "ATAB");
write_1d(c_file, header_file, PLAC, 100 + 1, "PLAC"); write_1d(c_file, header_file, PLAC, NOBJECTS + 1, "PLAC");
write_1d(c_file, header_file, FIXD, 100 + 1, "FIXD"); write_1d(c_file, header_file, FIXD, NOBJECTS + 1, "FIXD");
write_1d(c_file, header_file, ACTSPK, VRBSIZ + 1, "ACTSPK"); write_1d(c_file, header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
write_hints(c_file, header_file, HINTS, HNTSIZ + 1, 5, "HINTS"); write_hints(c_file, header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
} }

18
init.c
View file

@ -12,7 +12,7 @@
*/ */
/* Current limits: /* Current limits:
* 12500 words of message text (LINES, LINSIZ). * 12600 words of message text (LINES, LINSIZ).
* 885 travel options (TRAVEL, TRVSIZ). * 885 travel options (TRAVEL, TRVSIZ).
* 330 vocabulary words (KTAB, ATAB, TABSIZ). * 330 vocabulary words (KTAB, ATAB, TABSIZ).
* 185 locations (LTEXT, STEXT, KEY, COND, ABB, ATLOC, LOCSND, LOCSIZ). * 185 locations (LTEXT, STEXT, KEY, COND, ABB, ATLOC, LOCSND, LOCSIZ).
@ -30,6 +30,7 @@
* 300 locations * 300 locations
* 100 objects */ * 100 objects */
/* Note: the object count limit has been abstracted as NOBJECTS */
/* Description of the database format /* Description of the database format
* *
@ -87,7 +88,8 @@
* prop value is N/100. The N/100 is used only to distinguish multiple * prop value is N/100. The N/100 is used only to distinguish multiple
* messages from multi-line messages; the prop info actually requires all * messages from multi-line messages; the prop info actually requires all
* messages for an object to be present and consecutive. Properties which * messages for an object to be present and consecutive. Properties which
* produce no message should be given the message ">$<". * produce no message should be given the message ">$<". (The magic value
* 100 is now mostly abstracted out as NOBJECTS.)
* Section 6: Arbitrary messages. Same format as sections 1, 2, and 5, except * Section 6: Arbitrary messages. Same format as sections 1, 2, and 5, except
* the numbers bear no relation to anything (except for special verbs * the numbers bear no relation to anything (except for special verbs
* in section 4). * in section 4).
@ -177,7 +179,7 @@ static int finish_init(void) {
PLACE[I]=0; PLACE[I]=0;
PROP[I]=0; PROP[I]=0;
LINK[I]=0; LINK[I]=0;
{long x = I+100; LINK[x]=0;} {long x = I+NOBJECTS; LINK[x]=0;}
} /* end loop */ } /* end loop */
/* 1102 */ for (I=1; I<=LOCSIZ; I++) { /* 1102 */ for (I=1; I<=LOCSIZ; I++) {
@ -195,16 +197,16 @@ L1102: ATLOC[I]=0;
* "PLAC" and "FIXD". Also, since two-placed objects are typically best * "PLAC" and "FIXD". Also, since two-placed objects are typically best
* described last, we'll drop them first. */ * described last, we'll drop them first. */
/* 1106 */ for (I=1; I<=100; I++) { /* 1106 */ for (I=1; I<=NOBJECTS; I++) {
K=101-I; K=NOBJECTS + 1 - I;
if(FIXD[K] <= 0) goto L1106; if(FIXD[K] <= 0) goto L1106;
DROP(K+100,FIXD[K]); DROP(K+NOBJECTS,FIXD[K]);
DROP(K,PLAC[K]); DROP(K,PLAC[K]);
L1106: /*etc*/ ; L1106: /*etc*/ ;
} /* end loop */ } /* end loop */
for (I=1; I<=100; I++) { for (I=1; I<=NOBJECTS; I++) {
K=101-I; K=NOBJECTS + 1 - I;
FIXED[K]=FIXD[K]; FIXED[K]=FIXD[K];
if(PLAC[K] != 0 && FIXD[K] <= 0)DROP(K,PLAC[K]); if(PLAC[K] != 0 && FIXD[K] <= 0)DROP(K,PLAC[K]);
} /* end loop */ } /* end loop */

30
main.c
View file

@ -13,9 +13,9 @@
#include "database.h" #include "database.h"
long ABB[186], ATLOC[186], BLKLIN = true, DFLAG, long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
DLOC[7], FIXED[101], HOLDNG, DLOC[7], FIXED[NOBJECTS+1], HOLDNG,
LINK[201], LNLENG, LNPOSN, LINK[201], LNLENG, LNPOSN,
PARMS[26], PLACE[101], PARMS[26], PLACE[NOBJECTS+1],
SETUP = 0; SETUP = 0;
char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129]; char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
@ -33,7 +33,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
MESSAG, MIRROR, MXSCOR, MESSAG, MIRROR, MXSCOR,
NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ, NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER, ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], PYRAM, PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM,
RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY, RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK, SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT, STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
@ -356,7 +356,7 @@ L2001: if(TOTING(BEAR))RSPEAK(141);
I=ATLOC[LOC]; I=ATLOC[LOC];
L2004: if(I == 0) goto L2012; L2004: if(I == 0) goto L2012;
OBJ=I; OBJ=I;
if(OBJ > 100)OBJ=OBJ-100; if(OBJ > NOBJECTS)OBJ=OBJ-NOBJECTS;
if(OBJ == STEPS && TOTING(NUGGET)) goto L2008; if(OBJ == STEPS && TOTING(NUGGET)) goto L2008;
if(PROP[OBJ] >= 0) goto L2006; if(PROP[OBJ] >= 0) goto L2006;
if(CLOSED) goto L2008; if(CLOSED) goto L2008;
@ -409,7 +409,7 @@ L2602: /*etc*/ ;
L2603: if(!CLOSED) goto L2605; L2603: if(!CLOSED) goto L2605;
if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1); if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);
for (I=1; I<=100; I++) { for (I=1; I<=NOBJECTS; I++) {
if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I]; if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I];
} /* end loop */ } /* end loop */
L2605: WZDARK=DARK(0); L2605: WZDARK=DARK(0);
@ -538,7 +538,7 @@ L9: LL=labs(TRAVEL[KK]);
L10: LL=LL/1000; L10: LL=LL/1000;
L11: NEWLOC=LL/1000; L11: NEWLOC=LL/1000;
K=MOD(NEWLOC,100); K=MOD(NEWLOC,100); /* ESR: an instance of NOBJECTS? */
if(NEWLOC <= 300) goto L13; if(NEWLOC <= 300) goto L13;
if(PROP[K] != NEWLOC/100-3) goto L16; if(PROP[K] != NEWLOC/100-3) goto L16;
L12: if(TRAVEL[KK] < 0)BUG(25); L12: if(TRAVEL[KK] < 0)BUG(25);
@ -548,7 +548,7 @@ L12: if(TRAVEL[KK] < 0)BUG(25);
LL=NEWLOC; LL=NEWLOC;
goto L11; goto L11;
L13: if(NEWLOC <= 100) goto L14; L13: if(NEWLOC <= 100) goto L14; /* ESR: an instance of NOBJECTS? */
if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16; if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16;
goto L12; goto L12;
@ -572,7 +572,7 @@ L30000: NEWLOC=NEWLOC-300;
* table must include "useless" entries going through passage, which can never * table must include "useless" entries going through passage, which can never
* be used for actual motion, but can be spotted by "go back". */ * be used for actual motion, but can be spotted by "go back". */
L30100: NEWLOC=99+100-LOC; L30100: NEWLOC=99+100-LOC; /* ESR: an instance of NOBJECTS? */
if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true; if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true;
NEWLOC=LOC; NEWLOC=LOC;
RSPEAK(117); RSPEAK(117);
@ -595,9 +595,9 @@ L30300: if(PROP[TROLL] != 1) goto L30310;
PSPEAK(TROLL,1); PSPEAK(TROLL,1);
PROP[TROLL]=0; PROP[TROLL]=0;
MOVE(TROLL2,0); MOVE(TROLL2,0);
MOVE(TROLL2+100,0); MOVE(TROLL2+NOBJECTS,0);
MOVE(TROLL,PLAC[TROLL]); MOVE(TROLL,PLAC[TROLL]);
MOVE(TROLL+100,FIXD[TROLL]); MOVE(TROLL+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM); JUGGLE(CHASM);
NEWLOC=LOC; NEWLOC=LOC;
return true; return true;
@ -708,8 +708,8 @@ L99: if(CLOSNG) goto L95;
PLACE[WATER]=0; PLACE[WATER]=0;
PLACE[OIL]=0; PLACE[OIL]=0;
if(TOTING(LAMP))PROP[LAMP]=0; if(TOTING(LAMP))PROP[LAMP]=0;
/* 98 */ for (J=1; J<=100; J++) { /* 98 */ for (J=1; J<=NOBJECTS; J++) {
I=101-J; I=NOBJECTS + 1 - J;
if(!TOTING(I)) goto L98; if(!TOTING(I)) goto L98;
K=OLDLC2; K=OLDLC2;
if(I == LAMP)K=1; if(I == LAMP)K=1;
@ -832,9 +832,9 @@ L10000: PROP[GRATE]=0;
DLOC[I]=0; DLOC[I]=0;
} /* end loop */ } /* end loop */
MOVE(TROLL,0); MOVE(TROLL,0);
MOVE(TROLL+100,0); MOVE(TROLL+NOBJECTS,0);
MOVE(TROLL2,PLAC[TROLL]); MOVE(TROLL2,PLAC[TROLL]);
MOVE(TROLL2+100,FIXD[TROLL]); MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM); JUGGLE(CHASM);
if(PROP[BEAR] != 3)DSTROY(BEAR); if(PROP[BEAR] != 3)DSTROY(BEAR);
PROP[CHAIN]=0; PROP[CHAIN]=0;
@ -883,7 +883,7 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
PROP[MIRROR]=PUT(MIRROR,115,0); PROP[MIRROR]=PUT(MIRROR,115,0);
FIXED[MIRROR]=116; FIXED[MIRROR]=116;
for (I=1; I<=100; I++) { for (I=1; I<=NOBJECTS; I++) {
if(TOTING(I))DSTROY(I); if(TOTING(I))DSTROY(I);
} /* end loop */ } /* end loop */

14
misc.c
View file

@ -511,7 +511,7 @@ long I, J;
I=PLACE[OBJECT]; I=PLACE[OBJECT];
J=FIXED[OBJECT]; J=FIXED[OBJECT];
MOVE(OBJECT,I); MOVE(OBJECT,I);
MOVE(OBJECT+100,J); MOVE(OBJECT+NOBJECTS,J);
return; return;
} }
@ -523,10 +523,10 @@ long FROM;
* are not at any loc, since carry wants to remove objects from ATLOC chains. */ * are not at any loc, since carry wants to remove objects from ATLOC chains. */
if(OBJECT > 100) goto L1; if(OBJECT > NOBJECTS) goto L1;
FROM=PLACE[OBJECT]; FROM=PLACE[OBJECT];
goto L2; goto L2;
L1: {long x = OBJECT-100; FROM=FIXED[x];} L1: {long x = OBJECT-NOBJECTS; FROM=FIXED[x];}
L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM); L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM);
DROP(OBJECT,WHERE); DROP(OBJECT,WHERE);
return; return;
@ -547,10 +547,10 @@ void CARRY(long OBJECT, long WHERE) {
long TEMP; long TEMP;
/* Start toting an object, removing it from the list of things at its former /* Start toting an object, removing it from the list of things at its former
* location. Incr holdng unless it was already being toted. If OBJECT>100 * location. Incr holdng unless it was already being toted. If OBJECT>NOBJECTS
* (moving "fixed" second loc), don't change PLACE or HOLDNG. */ * (moving "fixed" second loc), don't change PLACE or HOLDNG. */
if(OBJECT > 100) goto L5; if(OBJECT > NOBJECTS) goto L5;
if(PLACE[OBJECT] == -1)return; if(PLACE[OBJECT] == -1)return;
PLACE[OBJECT]= -1; PLACE[OBJECT]= -1;
HOLDNG=HOLDNG+1; HOLDNG=HOLDNG+1;
@ -569,11 +569,11 @@ void DROP(long OBJECT, long WHERE) {
/* Place an object at a given loc, prefixing it onto the ATLOC list. Decr /* Place an object at a given loc, prefixing it onto the ATLOC list. Decr
* HOLDNG if the object was being toted. */ * HOLDNG if the object was being toted. */
if(OBJECT > 100) goto L1; if(OBJECT > NOBJECTS) goto L1;
if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1; if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1;
PLACE[OBJECT]=WHERE; PLACE[OBJECT]=WHERE;
goto L2; goto L2;
L1: {long x = OBJECT-100; FIXED[x]=WHERE;} L1: {long x = OBJECT-NOBJECTS; FIXED[x]=WHERE;}
L2: if(WHERE <= 0)return; L2: if(WHERE <= 0)return;
LINK[OBJECT]=ATLOC[WHERE]; LINK[OBJECT]=ATLOC[WHERE];
ATLOC[WHERE]=OBJECT; ATLOC[WHERE]=OBJECT;