X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=dungeon.c;h=a8b5f16e59af9a099160c63d2d64f2a55ac10095;hb=64035d00262d3b10c126748be659d22394b7ed3b;hp=08f11b12c2bef227f45a656d42721b0cb5f70d26;hpb=3a93b2b5f08351c3e87d4f41c5c61273c42e9420;p=open-adventure.git

diff --git a/dungeon.c b/dungeon.c
index 08f11b1..a8b5f16 100644
--- a/dungeon.c
+++ b/dungeon.c
@@ -17,6 +17,7 @@
 #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
@@ -30,7 +31,6 @@ long LINUSE;
 long TRVS;
 long TRNVLS;
 long TABNDX;
-long OBJTXT[NOBJECTS + 1];
 long KEY[LOCSIZ + 1];
 long LINES[LINSIZ + 1];
 long TRAVEL[TRVSIZ + 1];
@@ -299,17 +299,14 @@ static void read_hints(FILE* database)
     }
 }
 
-/*  Read the sound/text info, store in OBJSND, OBJTXT */
+/*  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) {
-            OBJTXT[K] = (I > 0 ? I : 0);
-            continue;
-        }
+	/* this stuff is in YAML now */
     }
 }
 
@@ -324,9 +321,6 @@ static int read_database(FILE* database)
      *  pointer-words in lines. PTEXT(N) points to
      *  message for game.prop(N)=0.  Successive prop messages are
      *  found by chasing pointers. */
-    for (int I = 1; I <= NOBJECTS; I++) {
-        OBJTXT[I] = 0;
-    }
     for (int I = 1; I <= LOCSIZ; I++) {
         KEY[I] = 0;
     }
@@ -437,7 +431,6 @@ static void write_file(FILE* header_file)
     fprintf(header_file, "\n");
 
     // content variables
-    write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
     write_1d(header_file, KEY, LOCSIZ + 1, "KEY");
     write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
     write_1d(header_file, KTAB, TABSIZ + 1, "KTAB");