Section 10 (class thresholds) is now parsed entirely from YAML.

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index 9aeda54ef6deff74051a03cdc5d0642894549601..e17e93c1eace177d93bf6e86c27dd10bed3be67d 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -30,7 +30,6 @@ static long OLDLOC;
 // Storage for what comes out of the database
 long LINUSE;
 long TRVS;
-long CLSSES;
 long TRNVLS;
 long TABNDX;
 long HNTMAX;
@@ -45,7 +44,6 @@ long COND[LOCSIZ + 1];
 long KEY[LOCSIZ + 1];
 long LOCSND[LOCSIZ + 1];
 long LINES[LINSIZ + 1];
-long CVAL[CLSMAX + 1];
 long TTEXT[TRNSIZ + 1];
 long TRNVAL[TRNSIZ + 1];
 long TRAVEL[TRVSIZ + 1];
@@ -228,11 +226,7 @@ static void read_messages(FILE* database, long sect)
             continue;
         }
         if (sect == 10) {
-            CLSSES = CLSSES + 1;
-            if (CLSSES > CLSMAX)
-                BUG(TOO_MANY_CLASS_OR_TURN_MESSAGES);
-            CTEXT[CLSSES] = LINUSE;
-            CVAL[CLSSES] = loc;
+           /* now parsed from YAML */
             continue;
         }
         if (sect == 6) {
@@ -398,7 +392,6 @@ static int read_database(FILE* database)
 
     LINUSE = 1;
     TRVS = 1;
-    CLSSES = 0;
     TRNVLS = 0;
 
     /*  Start new data section.  Sect is the section number. */
@@ -523,15 +516,12 @@ static void write_file(FILE* header_file)
     fprintf(header_file, "\n");
 
     // content variables
-    write_0d(header_file, TRNVLS, "TRNVLS");
     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, CVAL, CLSMAX + 1, "CVAL");
-    write_1d(header_file, TRNVAL, TRNSIZ + 1, "TRNVAL");
     write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
     write_1d(header_file, KTAB, TABSIZ + 1, "KTAB");
     write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");
@@ -547,8 +537,8 @@ static void write_file(FILE* header_file)
 
 void bug(enum bugtype num, const char *error_string)
 {
-   fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
-   exit(EXIT_FAILURE);
+    fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
+    exit(EXIT_FAILURE);
 }
 
 int main(void)