Inline the hint messages.

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index 6c6fcfdf1e9639116c52fce8f3a78a28a64af24a..3d59424d6cbbce22227c7f966fea6427488c08db 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -60,11 +60,6 @@
  *     or "attack").  Else, if M=3, the word is a special case verb (such as
  *     "dig") and N % 1000 is an index into section 6.  Objects from 50 to
  *     (currently, anyway) 79 are considered treasures (for pirate, closeout).
- *  Section 7: Object locations.  Each line contains an object number and its
- *     initial location (zero (or omitted) if none).  If the object is
- *     immovable, the location is followed by a "-1".  If it has two locations
- *     (e.g. the grate) the first location is followed with the second, and
- *     the object is assumed to be immovable.
  *  Section 8: Action defaults.  Each line contains an "action-verb" number and
  *     the index (in section 6) of the default message for the verb.
  *  Section 0: End of database.
@@ -104,8 +99,6 @@ long LINES[LINSIZ + 1];
 long TRAVEL[TRVSIZ + 1];
 long KTAB[TABSIZ + 1];
 long ATAB[TABSIZ + 1];
-long PLAC[NOBJECTS + 1];
-long FIXD[NOBJECTS + 1];
 long ACTSPK[VRBSIZ + 1];
 
 static long GETTXT(long SKIP, long ONEWRD, long UPPER)
@@ -241,9 +234,8 @@ static long GETNUM(FILE *source)
 }
 
 /*  Sections 1, 2, 5, 6, 10, 14.  Skip these, they're all in YAML now. */
-static void read_messages(FILE* database, long sect)
+static void read_messages(FILE* database)
 {
-    long KK = LINUSE;
     while (true) {
        do {
            if (NULL == fgets(INLINE + 1, sizeof(INLINE) - 1, database)) {
@@ -301,8 +293,7 @@ static void read_initial_locations(FILE* database)
 {
     long OBJ;
     while ((OBJ = GETNUM(database)) != -1) {
-        PLAC[OBJ] = GETNUM(NULL);
-        FIXD[OBJ] = GETNUM(NULL);
+       /* all done from YAML now */
     }
 }
 
@@ -345,8 +336,6 @@ static void read_sound_text(FILE* database)
 {
     long K;
     while ((K = GETNUM(database)) != -1) {
-        long KK = GETNUM(NULL);
-        long I = GETNUM(NULL);
        /* this stuff is in YAML now */
     }
 }
@@ -379,10 +368,10 @@ static int read_database(FILE* database)
         case 0:
             return (0);
         case 1:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         case 2:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         case 3:
             read_section3_stuff(database);
@@ -391,10 +380,10 @@ static int read_database(FILE* database)
             read_vocabulary(database);
             break;
         case 5:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         case 6:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         case 7:
             read_initial_locations(database);
@@ -406,7 +395,7 @@ static int read_database(FILE* database)
             read_conditions(database);
             break;
         case 10:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         case 11:
             read_hints(database);
@@ -417,7 +406,7 @@ static int read_database(FILE* database)
             read_sound_text(database);
             break;
         case 14:
-            read_messages(database, sect);
+            read_messages(database);
             break;
         default:
             BUG(INVALID_SECTION_NUMBER_IN_DATABASE);
@@ -476,8 +465,6 @@ static void write_file(FILE* header_file)
     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");
 
     fprintf(header_file, "#undef LOCATION\n");