X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=dungeon.c;h=a39e41394560b1d8f24916173a22a4e04b6a7166;hb=67ed99b29cfe5c32b3db72091de3fb174195e032;hp=544fce8ede90585d317a4b61c4f8b101ce97315e;hpb=fd02259c7f5d3b0fb245575981031a63bfb8b6de;p=open-adventure.git

diff --git a/dungeon.c b/dungeon.c
index 544fce8..a39e413 100644
--- a/dungeon.c
+++ b/dungeon.c
@@ -30,13 +30,11 @@ static long OLDLOC;
 // Storage for what comes out of the database
 long LINUSE;
 long TRVS;
-long CLSSES;
 long TRNVLS;
 long TABNDX;
 long HNTMAX;
 long PTEXT[NOBJECTS + 1];
 long RTEXT[RTXSIZ + 1];
-long CTEXT[CLSMAX + 1];
 long OBJSND[NOBJECTS + 1];
 long OBJTXT[NOBJECTS + 1];
 long STEXT[LOCSIZ + 1];
@@ -45,7 +43,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];
@@ -54,8 +51,6 @@ long ATAB[TABSIZ + 1];
 long PLAC[NOBJECTS + 1];
 long FIXD[NOBJECTS + 1];
 long ACTSPK[VRBSIZ + 1];
-long HINTS[HNTSIZ + 1][HINTLEN];
-
 
 static bool is_set(long var, long position)
 {
@@ -219,20 +214,8 @@ static void read_messages(FILE* database, long sect)
         if (loc == OLDLOC) continue;
         OLDLOC = loc;
         LINES[LINUSE] = -KK;
-        if (sect == 14) {
-            TRNVLS = TRNVLS + 1;
-            if (TRNVLS > TRNSIZ)
-                BUG(TOO_MANY_CLASS_OR_TURN_MESSAGES);
-            TTEXT[TRNVLS] = LINUSE;
-            TRNVAL[TRNVLS] = loc;
-            continue;
-        }
-        if (sect == 10) {
-            CLSSES = CLSSES + 1;
-            if (CLSSES > CLSMAX)
-                BUG(TOO_MANY_CLASS_OR_TURN_MESSAGES);
-            CTEXT[CLSSES] = LINUSE;
-            CVAL[CLSSES] = loc;
+        if (sect == 10 || sect == 14) {
+	    /* now parsed from YAML */
             continue;
         }
         if (sect == 6) {
@@ -340,7 +323,8 @@ static void read_hints(FILE* database)
         if (K <= 0 || K > HNTSIZ)
             BUG(TOO_MANY_HINTS);
         for (int I = 1; I <= 4; I++) {
-            HINTS[K][I] = GETNUM(NULL);
+	    /* consume - actual arrqy-building now done in YAML. */
+            GETNUM(NULL);
         } /* end loop */
         HNTMAX = (HNTMAX > K ? HNTMAX : K);
     }
@@ -366,17 +350,17 @@ static void read_sound_text(FILE* database)
 
 static int read_database(FILE* database)
 {
-
-    /*  Clear out the various text-pointer arrays.  All text is stored in array
-     *  lines; each line is preceded by a word pointing to 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 message for game.prop(N)=0.
-     *  Successive prop messages are found by chasing pointers.  RTEXT contains
-     *  section 6's stuff.  CTEXT(N) points to a player-class message.  TTEXT is for
-     *  section 14.  We also clear COND (see description of section 9 for details). */
-
+    /*  Clear out the various text-pointer arrays.  All text is stored
+     *  in array lines; each line is preceded by a word pointing to
+     *  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
+     *  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;
@@ -385,9 +369,6 @@ static int read_database(FILE* database)
     for (int I = 1; I <= RTXSIZ; I++) {
         RTEXT[I] = 0;
     }
-    for (int I = 1; I <= CLSMAX; I++) {
-        CTEXT[I] = 0;
-    }
     for (int I = 1; I <= LOCSIZ; I++) {
         STEXT[I] = 0;
         LTEXT[I] = 0;
@@ -398,7 +379,6 @@ static int read_database(FILE* database)
 
     LINUSE = 1;
     TRVS = 1;
-    CLSSES = 0;
     TRNVLS = 0;
 
     /*  Start new data section.  Sect is the section number. */
@@ -487,29 +467,8 @@ static void write_1d(FILE* header_file, long array[], long dim, const char* varn
     fprintf(header_file, "\n});\n");
 }
 
-static void write_hints(FILE* header_file, long matrix[][HINTLEN], long dim1, long dim2, const char* varname)
-{
-    fprintf(header_file, "LOCATION long %s[][%ld] INITIALIZE(= {\n", varname, dim2);
-    for (int i = 0; i < dim1; ++i) {
-        fprintf(header_file, "  {");
-        for (int j = 0; j < dim2; ++j) {
-            fprintf(header_file, "%ld, ", matrix[i][j]);
-        }
-        fprintf(header_file, "},\n");
-    }
-    fprintf(header_file, "});\n");
-}
-
 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 +477,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");
@@ -532,28 +490,30 @@ 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");
     write_1d(header_file, PLAC, NOBJECTS + 1, "PLAC");
     write_1d(header_file, FIXD, NOBJECTS + 1, "FIXD");
     write_1d(header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
-    write_hints(header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
 
     fprintf(header_file, "#undef LOCATION\n");
     fprintf(header_file, "#undef INITIALIZE\n");
     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");