Reexpress the motion words in adventure.yaml.

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index 6c6fcfdf1e9639116c52fce8f3a78a28a64af24a..a5531473116752dc260e90804c3b1a3067e57ef7 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -7,7 +7,6 @@
  *     12600 words of message text (LINES, LINSIZ).
  *     885 travel options (TRAVEL, TRVSIZ).
  *     330 vocabulary words (KTAB, ATAB, TABSIZ).
- *      35 "action" verbs (ACTSPK, VRBSIZ).
  *  There are also limits which cannot be exceeded due to the structure of
  *  the database.  (E.G., The vocabulary uses n/1000 to determine word type,
  *  so there can't be more than 1000 words.)  These upper limits are:
@@ -60,13 +59,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.
  *
  * Other sections are obsolete and ignored */
@@ -99,14 +91,11 @@ static long LINUSE;
 long TRVS;
 long TRNVLS;
 long TABNDX;
-long KEY[NLOCATIONS + 1];
+long TKEY[NLOCATIONS + 1];
 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)
 {
@@ -209,7 +198,7 @@ static long GETNUM(FILE *source)
      *  scanned).  If we're at the end of the line or encounter an illegal
      *  character (not a digit, hyphen, or blank), we return 0. */
 
-    long DIGIT, GETNUM, SIGN;
+    long DIGIT, GETNUM, sign;
 
     if (source != NULL) MAPLIN(source);
     GETNUM = 0;
@@ -220,9 +209,9 @@ static long GETNUM(FILE *source)
     }
 
     if (INLINE[LNPOSN] != 9) {
-        SIGN = 1;
+        sign = 1;
     } else {
-        SIGN = -1;
+        sign = -1;
         LNPOSN = LNPOSN + 1;
     }
     while (!(LNPOSN > LNLENG || INLINE[LNPOSN] == 0)) {
@@ -235,15 +224,14 @@ static long GETNUM(FILE *source)
         LNPOSN = LNPOSN + 1;
     }
 
-    GETNUM = GETNUM * SIGN;
+    GETNUM = GETNUM * sign;
     LNPOSN = LNPOSN + 1;
     return (GETNUM);
 }
 
 /*  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)) {
@@ -266,8 +254,8 @@ static void read_section3_stuff(FILE* database)
     while ((loc = GETNUM(database)) != -1) {
         long newloc = GETNUM(NULL);
         long L;
-        if (KEY[loc] == 0) {
-            KEY[loc] = TRVS;
+        if (TKEY[loc] == 0) {
+            TKEY[loc] = TRVS;
         } else {
             TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1];
         }
@@ -301,17 +289,16 @@ 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 */
     }
 }
 
-/*  Read default message numbers for action verbs, store in ACTSPK. */
+/*  Read default message numbers for action verbs. */
 static void read_action_verb_message_nr(FILE* database)
 {
     long verb;
     while ((verb = GETNUM(database)) != -1) {
-        ACTSPK[verb] = GETNUM(NULL);
+       /* now declared in YAML */
     }
 }
 
@@ -345,8 +332,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 */
     }
 }
@@ -363,7 +348,7 @@ static int read_database(FILE* database)
      *  message for game.prop(N)=0.  Successive prop messages are
      *  found by chasing pointers. */
     for (int I = 1; I <= NLOCATIONS; I++) {
-        KEY[I] = 0;
+        TKEY[I] = 0;
     }
 
     LINUSE = 1;
@@ -379,10 +364,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 +376,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 +391,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 +402,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);
@@ -472,13 +457,10 @@ static void write_file(FILE* header_file)
     fprintf(header_file, "\n");
 
     // content variables
-    write_1d(header_file, KEY, NLOCATIONS + 1, "KEY");
+    write_1d(header_file, TKEY, NLOCATIONS + 1, "TKEY");
     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");
     fprintf(header_file, "#undef INITIALIZE\n");