X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=dungeon.c;h=725152d44c096166a6f6765a16eb35fa000ce6a0;hp=88f632d059c93f3e03c39ba0c9416d348edf015c;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=f47dc9f44798e3d03e4760c8b53b44c7de4c92f9 diff --git a/dungeon.c b/dungeon.c index 88f632d..725152d 100644 --- a/dungeon.c +++ b/dungeon.c @@ -1,22 +1,48 @@ /* * The dungeon compiler. Turns adventure.text into a set of C initializers - * defining (mostly) invariant state. A couple of slots are messed with - * at runtime. + * defining invariant state. */ +/* Current limits: + * 12600 words of message text (LINES, LINSIZ). + * 330 vocabulary words (KTAB, ATAB, TABSIZ). + * There are also limits which cannot be exceeded due to the structure of + * the database. (E.G., The vocabulary uses n/1000 to determine word type, + * so there can't be more than 1000 words.) These upper limits are: + * 1000 non-synonymous vocabulary words + * 300 locations + * 100 objects + */ + +/* Description of the database format + * + * + * The data file contains several sections. Each begins with a line containing + * a number identifying the section, and ends with a line containing "-1". + * + * Section 4: Vocabulary. Each line contains a number (n), a tab, and a + * five-letter word. Call M=N/1000. If M=0, then the word is a motion + * verb for use in travelling (see section 3). Else, if M=1, the word is + * an object. Else, if M=2, the word is an action verb (such as "carry" + * or "attack"). Else, if M=3, the word is a special case verb (such as + * "dig") and N % 1000 is an index into section 6. Objects from 50 to + * (currently, anyway) 79 are considered treasures (for pirate, closeout). + * Section 0: End of database. + * + * Other sections are obsolete and ignored */ + #define LINESIZE 100 -#define CLSMAX 12 #define LINSIZ 12600 -#define TRNSIZ 5 #define TABSIZ 330 #define VRBSIZ 35 -#define TRVSIZ 885 #define TOKLEN 5 #include #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 @@ -24,22 +50,13 @@ static long LNLENG; static long LNPOSN; static char INLINE[LINESIZE + 1]; static long OLDLOC; +static long LINUSE; // Storage for what comes out of the database -long LINUSE; -long TRVS; -long TRNVLS; long TABNDX; -long OBJSND[NOBJECTS + 1]; -long OBJTXT[NOBJECTS + 1]; -long KEY[LOCSIZ + 1]; long LINES[LINSIZ + 1]; -long TRAVEL[TRVSIZ + 1]; long KTAB[TABSIZ + 1]; long ATAB[TABSIZ + 1]; -long PLAC[NOBJECTS + 1]; -long FIXD[NOBJECTS + 1]; -long ACTSPK[VRBSIZ + 1]; static long GETTXT(long SKIP, long ONEWRD, long UPPER) { @@ -142,7 +159,7 @@ static long GETNUM(FILE *source) * scanned). If we're at the end of the line or encounter an illegal * character (not a digit, hyphen, or blank), we return 0. */ - long DIGIT, GETNUM, SIGN; + long DIGIT, GETNUM, sign; if (source != NULL) MAPLIN(source); GETNUM = 0; @@ -153,9 +170,9 @@ static long GETNUM(FILE *source) } if (INLINE[LNPOSN] != 9) { - SIGN = 1; + sign = 1; } else { - SIGN = -1; + sign = -1; LNPOSN = LNPOSN + 1; } while (!(LNPOSN > LNLENG || INLINE[LNPOSN] == 0)) { @@ -168,55 +185,27 @@ static long GETNUM(FILE *source) LNPOSN = LNPOSN + 1; } - GETNUM = GETNUM * SIGN; + GETNUM = GETNUM * sign; LNPOSN = LNPOSN + 1; return (GETNUM); } -/* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */ -static void read_messages(FILE* database, long sect) +/* Sections 1, 2, 5, 6, 10, 14. Skip these, they're all in YAML now. */ +static void read_messages(FILE* database) { - long KK = LINUSE; while (true) { - long loc; - LINUSE = KK; - loc = GETNUM(database); - if (LNLENG >= LNPOSN + 70) - BUG(MESSAGE_LINE_GT_70_CHARACTERS); - if (loc == -1) return; - if (LNLENG < LNPOSN) - BUG(NULL_LINE_IN_MESSAGE); - do { - KK = KK + 1; - if (KK >= LINSIZ) - BUG(TOO_MANY_WORDS_OF_MESSAGES); - LINES[KK] = GETTXT(false, false, false); - } while (LINES[KK] != -1); - LINES[LINUSE] = KK; - if (loc == OLDLOC) continue; - OLDLOC = loc; - LINES[LINUSE] = -KK; - if (sect == 10 || sect == 14) { - /* now parsed from YAML */ - continue; - } - if (sect == 5) { - /* Now handled in YAML */ - continue; - } - if (sect == 6) { - /* Now handled in YAML */ - continue; - } - if (sect == 1) { - /* Now handled in YAML */ - continue; - } + do { + if (NULL == fgets(INLINE + 1, sizeof(INLINE) - 1, database)) { + printf("Failed fgets()\n"); + } + } while (!feof(database) && INLINE[1] == '#'); + if (strncmp(INLINE + 1, "-1\n", 3) == 0) + break; } } /* The stuff for section 3 is encoded here. Each "from-location" gets a - * contiguous section of the "TRAVEL" array. Each entry in travel is + * contiguous section of the "travel" array. Each entry in travel is * newloc*1000 + KEYWORD (from section 4, motion verbs), and is negated if * this is the last entry for this location. KEY(N) is the index in travel * of the first option at location N. */ @@ -224,20 +213,7 @@ static void read_section3_stuff(FILE* database) { long loc; while ((loc = GETNUM(database)) != -1) { - long newloc = GETNUM(NULL); - long L; - if (KEY[loc] == 0) { - KEY[loc] = TRVS; - } else { - TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1]; - } - while ((L = GETNUM(NULL)) != 0) { - TRAVEL[TRVS] = newloc * 1000 + L; - TRVS = TRVS + 1; - if (TRVS == TRVSIZ) - BUG(TOO_MANY_TRAVEL_OPTIONS); - } - TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1]; + /* Now done from YAML */ } } @@ -261,17 +237,16 @@ static void read_initial_locations(FILE* database) { long OBJ; while ((OBJ = GETNUM(database)) != -1) { - PLAC[OBJ] = GETNUM(NULL); - FIXD[OBJ] = GETNUM(NULL); + /* all done from YAML now */ } } -/* Read default message numbers for action verbs, store in ACTSPK. */ +/* Read default message numbers for action verbs. */ static void read_action_verb_message_nr(FILE* database) { long verb; while ((verb = GETNUM(database)) != -1) { - ACTSPK[verb] = GETNUM(NULL); + /* now declared in YAML */ } } @@ -300,18 +275,12 @@ static void read_hints(FILE* database) } } -/* Read the sound/text info, store in OBJSND, OBJTXT */ +/* 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; - } + /* this stuff is in YAML now */ } } @@ -326,17 +295,8 @@ static int read_database(FILE* database) * pointer-words in lines. PTEXT(N) points to * message for game.prop(N)=0. Successive prop messages are * found by chasing pointers. */ - for (int I = 1; I <= NOBJECTS; I++) { - OBJSND[I] = 0; - OBJTXT[I] = 0; - } - for (int I = 1; I <= LOCSIZ; I++) { - KEY[I] = 0; - } LINUSE = 1; - TRVS = 1; - TRNVLS = 0; /* Start new data section. Sect is the section number. */ @@ -347,10 +307,10 @@ static int read_database(FILE* database) case 0: return (0); case 1: - read_messages(database, sect); + read_messages(database); break; case 2: - read_messages(database, sect); + read_messages(database); break; case 3: read_section3_stuff(database); @@ -359,10 +319,10 @@ static int read_database(FILE* database) read_vocabulary(database); break; case 5: - read_messages(database, sect); + read_messages(database); break; case 6: - read_messages(database, sect); + read_messages(database); break; case 7: read_initial_locations(database); @@ -374,7 +334,7 @@ static int read_database(FILE* database) read_conditions(database); break; case 10: - read_messages(database, sect); + read_messages(database); break; case 11: read_hints(database); @@ -385,7 +345,7 @@ static int read_database(FILE* database) read_sound_text(database); break; case 14: - read_messages(database, sect); + read_messages(database); break; default: BUG(INVALID_SECTION_NUMBER_IN_DATABASE); @@ -440,15 +400,8 @@ static void write_file(FILE* header_file) fprintf(header_file, "\n"); // content variables - write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND"); - write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT"); - write_1d(header_file, KEY, LOCSIZ + 1, "KEY"); - write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL"); write_1d(header_file, KTAB, TABSIZ + 1, "KTAB"); write_1d(header_file, ATAB, TABSIZ + 1, "ATAB"); - write_1d(header_file, PLAC, NOBJECTS + 1, "PLAC"); - write_1d(header_file, FIXD, NOBJECTS + 1, "FIXD"); - write_1d(header_file, ACTSPK, VRBSIZ + 1, "ACTSPK"); fprintf(header_file, "#undef LOCATION\n"); fprintf(header_file, "#undef INITIALIZE\n");