X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=dungeon.c;h=a5531473116752dc260e90804c3b1a3067e57ef7;hb=a76cbeccbb1e7d957cf7036a7125abb48f22eb9d;hp=feb98e79be2f7069dbf523049bfd0da20b0e6dde;hpb=3e19c39f579dacb20c1c9b6fc1a26c8d106f1365;p=open-adventure.git diff --git a/dungeon.c b/dungeon.c index feb98e7..a553147 100644 --- a/dungeon.c +++ b/dungeon.c @@ -7,7 +7,6 @@ * 12600 words of message text (LINES, LINSIZ). * 885 travel options (TRAVEL, TRVSIZ). * 330 vocabulary words (KTAB, ATAB, TABSIZ). - * 35 "action" verbs (ACTSPK, VRBSIZ). * 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: @@ -60,29 +59,10 @@ * 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 8: Action defaults. Each line contains an "action-verb" number and - * the index (in section 6) of the default message for the verb. * Section 0: End of database. * * Other sections are obsolete and ignored */ -/* The various messages (sections 1, 2, 5, 6, etc.) may include certain - * special character sequences to denote that the program must provide - * parameters to insert into a message when the message is printed. These - * sequences are: - * %S = The letter 'S' or nothing (if a given value is exactly 1) - * %W = A word (up to 10 characters) - * %L = A word mapped to lower-case letters - * %U = A word mapped to upper-case letters - * %C = A word mapped to lower-case, first letter capitalised - * %T = Several words of text, ending with a word of -1 - * %1 = A 1-digit number - * %2 = A 2-digit number - * ... - * %9 = A 9-digit number - * %B = Variable number of blanks - * %! = The entire message should be suppressed */ - #define LINESIZE 100 #define CLSMAX 12 #define LINSIZ 12600 @@ -96,6 +76,7 @@ #include #include #include +#include #include "newdb.h" #include "common.h" @@ -110,14 +91,11 @@ static long LINUSE; long TRVS; long TRNVLS; long TABNDX; -long KEY[NLOCATIONS + 1]; +long TKEY[NLOCATIONS + 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) { @@ -220,7 +198,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; @@ -231,9 +209,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)) { @@ -246,50 +224,22 @@ 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; } } @@ -304,8 +254,8 @@ static void read_section3_stuff(FILE* database) while ((loc = GETNUM(database)) != -1) { long newloc = GETNUM(NULL); long L; - if (KEY[loc] == 0) { - KEY[loc] = TRVS; + if (TKEY[loc] == 0) { + TKEY[loc] = TRVS; } else { TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1]; } @@ -339,17 +289,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 */ } } @@ -383,8 +332,6 @@ static void read_sound_text(FILE* database) { long K; while ((K = GETNUM(database)) != -1) { - long KK = GETNUM(NULL); - long I = GETNUM(NULL); /* this stuff is in YAML now */ } } @@ -401,7 +348,7 @@ static int read_database(FILE* database) * message for game.prop(N)=0. Successive prop messages are * found by chasing pointers. */ for (int I = 1; I <= NLOCATIONS; I++) { - KEY[I] = 0; + TKEY[I] = 0; } LINUSE = 1; @@ -417,10 +364,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); @@ -429,10 +376,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); @@ -444,7 +391,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); @@ -455,7 +402,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); @@ -510,13 +457,10 @@ static void write_file(FILE* header_file) fprintf(header_file, "\n"); // content variables - write_1d(header_file, KEY, NLOCATIONS + 1, "KEY"); + write_1d(header_file, TKEY, NLOCATIONS + 1, "TKEY"); 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");