LOCSIZ -> NLOCATIONS, finishing limit-name cleanup.

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index f34cf129cc2a183eff17e3938451520b813ab111..fea3c6d217cda8d48857e75ee6f88e4820190a80 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -5,7 +5,6 @@
  */
 
 #define LINESIZE 100
-#define RTXSIZ 277
 #define CLSMAX 12
 #define LINSIZ 12600
 #define TRNSIZ 5
@@ -13,13 +12,12 @@
 #define VRBSIZ 35
 #define TRVSIZ 885
 #define TOKLEN 5
-#define HINTLEN 5
-#define HNTSIZ 20
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include "newdb.h"
 #include "common.h"
 
 // Global variables for use in functions below that can gradually disappear as code is cleaned up
@@ -33,18 +31,8 @@ long LINUSE;
 long TRVS;
 long TRNVLS;
 long TABNDX;
-long HNTMAX;
-long PTEXT[NOBJECTS + 1];
-long RTEXT[RTXSIZ + 1];
-long OBJSND[NOBJECTS + 1];
-long OBJTXT[NOBJECTS + 1];
-long STEXT[LOCSIZ + 1];
-long LTEXT[LOCSIZ + 1];
-long KEY[LOCSIZ + 1];
-long LOCSND[LOCSIZ + 1];
+long KEY[NLOCATIONS + 1];
 long LINES[LINSIZ + 1];
-long TTEXT[TRNSIZ + 1];
-long TRNVAL[TRNSIZ + 1];
 long TRAVEL[TRVSIZ + 1];
 long KTAB[TABSIZ + 1];
 long ATAB[TABSIZ + 1];
@@ -52,13 +40,6 @@ long PLAC[NOBJECTS + 1];
 long FIXD[NOBJECTS + 1];
 long ACTSPK[VRBSIZ + 1];
 
-static bool is_set(long var, long position)
-{
-    long mask = 1L << position;
-    bool result = (var & mask) == mask;
-    return (result);
-}
-
 static long GETTXT(long SKIP, long ONEWRD, long UPPER)
 {
     /*  Take characters from an input line and pack them into 30-bit words.
@@ -218,24 +199,18 @@ static void read_messages(FILE* database, long sect)
            /* now parsed from YAML */
             continue;
         }
-        if (sect == 6) {
-            if (loc > RTXSIZ)
-                BUG(TOO_MANY_RTEXT_MESSAGES);
-            RTEXT[loc] = LINUSE;
+        if (sect == 5) {
+           /* Now handled in YAML */   
             continue;
         }
-        if (sect == 5) {
-            if (loc > 0 && loc <= NOBJECTS)PTEXT[loc] = LINUSE;
+        if (sect == 6) {
+           /* Now handled in YAML */
             continue;
         }
-        if (loc > LOCSIZ)
-            BUG(TOO_MANY_LOCATIONS);
         if (sect == 1) {
-            LTEXT[loc] = LINUSE;
+           /* Now handled in YAML */
             continue;
         }
-
-        STEXT[loc] = LINUSE;
     }
 }
 
@@ -316,32 +291,22 @@ static void read_conditions(FILE* database)
 static void read_hints(FILE* database)
 {
     long K;
-    HNTMAX = 0;
     while ((K = GETNUM(database)) != -1) {
-        if (K <= 0 || K > HNTSIZ)
-            BUG(TOO_MANY_HINTS);
         for (int I = 1; I <= 4; I++) {
-           /* consume - actual arrqy-building now done in YAML. */
+           /* consume - actual array-building now done in YAML. */
             GETNUM(NULL);
         } /* end loop */
-        HNTMAX = (HNTMAX > K ? HNTMAX : K);
     }
 }
 
-/*  Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
+/*  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;
-        }
-
-        LOCSND[K] = KK;
+       /* this stuff is in YAML now */
     }
 }
 
@@ -353,24 +318,11 @@ static int read_database(FILE* database)
      *  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
+     *  pointer-words in lines. 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. */
-    for (int I = 1; I <= NOBJECTS; I++) {
-        PTEXT[I] = 0;
-        OBJSND[I] = 0;
-        OBJTXT[I] = 0;
-    }
-    for (int I = 1; I <= RTXSIZ; I++) {
-        RTEXT[I] = 0;
-    }
-    for (int I = 1; I <= LOCSIZ; I++) {
-        STEXT[I] = 0;
-        LTEXT[I] = 0;
+     *  found by chasing pointers. */
+    for (int I = 1; I <= NLOCATIONS; I++) {
         KEY[I] = 0;
-        LOCSND[I] = 0;
     }
 
     LINUSE = 1;
@@ -465,7 +417,6 @@ static void write_file(FILE* header_file)
 
     fprintf(header_file, "#include \"common.h\"\n");
     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, "\n");
 
@@ -480,10 +431,7 @@ 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, LOCSND, LOCSIZ + 1, "LOCSND");
+    write_1d(header_file, KEY, NLOCATIONS + 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");