X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=dungeon.c;h=a8b5f16e59af9a099160c63d2d64f2a55ac10095;hb=64035d00262d3b10c126748be659d22394b7ed3b;hp=e92dcc98039e55a5ecf8a3f5aadf8e9df8877670;hpb=82f162dc3246f17ee08579ee5aa755937fd4bf09;p=open-adventure.git diff --git a/dungeon.c b/dungeon.c index e92dcc9..a8b5f16 100644 --- a/dungeon.c +++ b/dungeon.c @@ -5,7 +5,6 @@ */ #define LINESIZE 100 -#define RTXSIZ 277 #define CLSMAX 12 #define LINSIZ 12600 #define TRNSIZ 5 @@ -13,12 +12,12 @@ #define VRBSIZ 35 #define TRVSIZ 885 #define TOKLEN 5 -#define HINTLEN 5 #include #include #include #include +#include "newdb.h" #include "common.h" // Global variables for use in functions below that can gradually disappear as code is cleaned up @@ -32,19 +31,8 @@ long LINUSE; long TRVS; long TRNVLS; long TABNDX; -long HNTMAX; -long PTEXT[NOBJECTS + 1]; -long RTEXT[RTXSIZ + 1]; -long OBJSND[NOBJECTS + 1]; -long OBJTXT[NOBJECTS + 1]; -long STEXT[LOCSIZ + 1]; -long LTEXT[LOCSIZ + 1]; -long COND[LOCSIZ + 1]; long KEY[LOCSIZ + 1]; -long LOCSND[LOCSIZ + 1]; long LINES[LINSIZ + 1]; -long TTEXT[TRNSIZ + 1]; -long TRNVAL[TRNSIZ + 1]; long TRAVEL[TRVSIZ + 1]; long KTAB[TABSIZ + 1]; long ATAB[TABSIZ + 1]; @@ -52,13 +40,6 @@ long PLAC[NOBJECTS + 1]; long FIXD[NOBJECTS + 1]; long ACTSPK[VRBSIZ + 1]; -static bool is_set(long var, long position) -{ - long mask = 1L << position; - bool result = (var & mask) == mask; - return (result); -} - static long GETTXT(long SKIP, long ONEWRD, long UPPER) { /* Take characters from an input line and pack them into 30-bit words. @@ -218,24 +199,18 @@ static void read_messages(FILE* database, long sect) /* now parsed from YAML */ continue; } - if (sect == 6) { - if (loc > RTXSIZ) - BUG(TOO_MANY_RTEXT_MESSAGES); - RTEXT[loc] = LINUSE; + if (sect == 5) { + /* Now handled in YAML */ continue; } - if (sect == 5) { - if (loc > 0 && loc <= NOBJECTS)PTEXT[loc] = LINUSE; + if (sect == 6) { + /* Now handled in YAML */ continue; } - if (loc > LOCSIZ) - BUG(TOO_MANY_LOCATIONS); if (sect == 1) { - LTEXT[loc] = LINUSE; + /* Now handled in YAML */ continue; } - - STEXT[loc] = LINUSE; } } @@ -299,16 +274,14 @@ static void read_action_verb_message_nr(FILE* database) } } -/* Read info about available liquids and other conditions, store in COND. */ +/* Read info about available liquids and other conditions. */ static void read_conditions(FILE* database) { long K; while ((K = GETNUM(database)) != -1) { long loc; while ((loc = GETNUM(NULL)) != 0) { - if (is_set(COND[loc], K)) - BUG(LOCATION_HAS_CONDITION_BIT_BEING_SET_TWICE); - COND[loc] = COND[loc] + (1L << K); + continue; /* COND is no longer used */ } } } @@ -318,32 +291,22 @@ static void read_conditions(FILE* database) static void read_hints(FILE* database) { long K; - HNTMAX = 0; while ((K = GETNUM(database)) != -1) { - if (K <= 0 || K > HNTSIZ) - BUG(TOO_MANY_HINTS); for (int I = 1; I <= 4; I++) { - /* consume - actual arrqy-building now done in YAML. */ + /* consume - actual array-building now done in YAML. */ GETNUM(NULL); } /* end loop */ - HNTMAX = (HNTMAX > K ? HNTMAX : K); } } -/* Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */ +/* Read the sound/text info */ static void read_sound_text(FILE* database) { long K; while ((K = GETNUM(database)) != -1) { long KK = GETNUM(NULL); long I = GETNUM(NULL); - if (I != 0) { - OBJSND[K] = (KK > 0 ? KK : 0); - OBJTXT[K] = (I > 0 ? I : 0); - continue; - } - - LOCSND[K] = KK; + /* this stuff is in YAML now */ } } @@ -355,26 +318,11 @@ static int read_database(FILE* database) * the next pointer (i.e. the word following the end of the * line). The pointer is negative if this is first line of a * message. The text-pointer arrays contain indices of - * pointer-words in lines. STEXT(N) is short description of - * location N. LTEXT(N) is long description. PTEXT(N) points to + * pointer-words in lines. PTEXT(N) points to * message for game.prop(N)=0. Successive prop messages are - * found by chasing pointers. RTEXT contains section 6's stuff. - * TTEXT is for section 14. We also clear COND (see description - * of section 9 for details). */ - for (int I = 1; I <= NOBJECTS; I++) { - PTEXT[I] = 0; - OBJSND[I] = 0; - OBJTXT[I] = 0; - } - for (int I = 1; I <= RTXSIZ; I++) { - RTEXT[I] = 0; - } + * found by chasing pointers. */ for (int I = 1; I <= LOCSIZ; I++) { - STEXT[I] = 0; - LTEXT[I] = 0; - COND[I] = 0; KEY[I] = 0; - LOCSND[I] = 0; } LINUSE = 1; @@ -439,8 +387,7 @@ static int read_database(FILE* database) /* Finish constructing internal data format */ /* Having read in the database, certain things are now constructed. - * game.propS are set to zero. We finish setting up COND by checking for - * forced-motion travel entries. The PLAC and FIXD arrays are used + * game.propS are set to zero. The PLAC and FIXD arrays are used * to set up game.atloc(N) as the first object at location N, and * game.link(OBJ) as the next object at the same location as OBJ. * (OBJ>NOBJECTS indicates that game.fixed(OBJ-NOBJECTS)=LOC; game.link(OBJ) is @@ -448,11 +395,6 @@ static int read_database(FILE* database) * whether the abbreviated description is printed. Counts modulo 5 * unless "LOOK" is used. */ -static void write_0d(FILE* header_file, long single, const char* varname) -{ - fprintf(header_file, "LOCATION long %s INITIALIZE(= %ld);\n", varname, single); -} - static void write_1d(FILE* header_file, long array[], long dim, const char* varname) { fprintf(header_file, "LOCATION long %s[] INITIALIZE(= {\n", varname); @@ -475,7 +417,6 @@ static void write_file(FILE* header_file) fprintf(header_file, "#include \"common.h\"\n"); fprintf(header_file, "#define TABSIZ 330\n"); - fprintf(header_file, "#define HNTSIZ 20\n"); fprintf(header_file, "#define TOKLEN %d\n", TOKLEN); fprintf(header_file, "\n"); @@ -490,12 +431,7 @@ static void write_file(FILE* header_file) fprintf(header_file, "\n"); // content variables - write_0d(header_file, HNTMAX, "HNTMAX"); - write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND"); - write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT"); - write_1d(header_file, COND, LOCSIZ + 1, "COND"); write_1d(header_file, KEY, LOCSIZ + 1, "KEY"); - write_1d(header_file, LOCSND, LOCSIZ + 1, "LOCSND"); write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL"); write_1d(header_file, KTAB, TABSIZ + 1, "KTAB"); write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");