X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=dungeon.c;h=0ffebe1e1eb6f522314bbbac222ff7401cd553b9;hp=ffa5140b6fdf4c482e161a89a809c2c533f6b922;hb=6ecd0010931a988792e672e1fe0a1192fca7b002;hpb=04eca720d9a5282b47f51c5d19910a094f3d1882 diff --git a/dungeon.c b/dungeon.c index ffa5140..0ffebe1 100644 --- a/dungeon.c +++ b/dungeon.c @@ -230,7 +230,7 @@ static void read_messages(FILE* database, long sect) if (sect == 10) { CLSSES = CLSSES + 1; if (CLSSES > CLSMAX) - BUG(TOO_MANY_CLASS_OR_TURN_MESSAGES); + BUG(TOO_MANY_CLASS_OR_TURN_MESSAGES); CTEXT[CLSSES] = LINUSE; CVAL[CLSSES] = loc; continue; @@ -324,7 +324,7 @@ static void read_conditions(FILE* database) long loc; while ((loc = GETNUM(NULL)) != 0) { if (is_set(COND[loc], K)) - BUG(LOCATION_HAS_CONDITION_BIT_BEING_SET_TWICE); + BUG(LOCATION_HAS_CONDITION_BIT_BEING_SET_TWICE); COND[loc] = COND[loc] + (1l << K); } } @@ -338,7 +338,7 @@ static void read_hints(FILE* database) HNTMAX = 0; while ((K = GETNUM(database)) != -1) { if (K <= 0 || K > HNTSIZ) - BUG(TOO_MANY_HINTS); + BUG(TOO_MANY_HINTS); for (int I = 1; I <= 4; I++) { HINTS[K][I] = GETNUM(NULL); } /* end loop */ @@ -502,14 +502,6 @@ static void write_hints(FILE* header_file, long matrix[][HINTLEN], long dim1, lo static void write_file(FILE* header_file) { - int MAXDIE; - for (int i = 0; i <= 4; i++) { - long x = 2 * i + 81; - if (RTEXT[x] != 0) - MAXDIE = i + 1; - } - - fprintf(header_file, "#ifndef DATABASE_H\n"); fprintf(header_file, "#define DATABASE_H\n"); fprintf(header_file, "\n"); @@ -518,7 +510,6 @@ static void write_file(FILE* header_file) 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, "#define MAXDIE %d\n", MAXDIE); fprintf(header_file, "\n"); fprintf(header_file, "\n"); @@ -554,6 +545,12 @@ static void write_file(FILE* header_file) fprintf(header_file, "#endif\n"); } +void bug(enum bugtype num, const char *error_string) +{ + fprintf(stderr, "Fatal error %d, %s.\n", num, error_string); + exit(EXIT_FAILURE); +} + int main(void) { FILE* database = fopen("adventure.text", "r");