X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=dungeon.c;h=a5531473116752dc260e90804c3b1a3067e57ef7;hb=a76cbeccbb1e7d957cf7036a7125abb48f22eb9d;hp=3d59424d6cbbce22227c7f966fea6427488c08db;hpb=9301a4f4193472d7698e8292a7bba96a44c609e7;p=open-adventure.git

diff --git a/dungeon.c b/dungeon.c
index 3d59424..a553147 100644
--- 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,8 +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 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 */
@@ -94,12 +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 ACTSPK[VRBSIZ + 1];
 
 static long GETTXT(long SKIP, long ONEWRD, long UPPER)
 {
@@ -202,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;
@@ -213,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)) {
@@ -228,7 +224,7 @@ static long GETNUM(FILE *source)
         LNPOSN = LNPOSN + 1;
     }
 
-    GETNUM = GETNUM * SIGN;
+    GETNUM = GETNUM * sign;
     LNPOSN = LNPOSN + 1;
     return (GETNUM);
 }
@@ -258,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];
         }
@@ -297,12 +293,12 @@ static void read_initial_locations(FILE* database)
     }
 }
 
-/*  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 */
     }
 }
 
@@ -352,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;
@@ -461,11 +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, ACTSPK, VRBSIZ + 1, "ACTSPK");
 
     fprintf(header_file, "#undef LOCATION\n");
     fprintf(header_file, "#undef INITIALIZE\n");