X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=dungeon.c;h=60c91f80c9d5093d7ac9104fb4237a35a954ad94;hb=59243cf8bc1939348467810bc63e107728a680c4;hp=00cccd2c9bfa91a527e4dca612b57134c8ab0b85;hpb=e9e747cffb273e85f4a42465813e1dca2b220e51;p=open-adventure.git

diff --git a/dungeon.c b/dungeon.c
index 00cccd2..60c91f8 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,34 +59,10 @@
  *	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 */
 
-/*  The various messages (sections 1, 2, 5, 6, etc.) may include certain
- *  special character sequences to denote that the program must provide
- *  parameters to insert into a message when the message is printed.  These
- *  sequences are:
- *	%S = The letter 'S' or nothing (if a given value is exactly 1)
- *	%W = A word (up to 10 characters)
- *	%L = A word mapped to lower-case letters
- *	%U = A word mapped to upper-case letters
- *	%C = A word mapped to lower-case, first letter capitalised
- *	%T = Several words of text, ending with a word of -1
- *	%1 = A 1-digit number
- *	%2 = A 2-digit number
- *	...
- *	%9 = A 9-digit number
- *	%B = Variable number of blanks
- *	%! = The entire message should be suppressed */
-
 #define LINESIZE 100
 #define CLSMAX 12
 #define LINSIZ 12600
@@ -121,9 +96,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)
 {
@@ -258,9 +230,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)) {
@@ -318,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 */
     }
 }
 
@@ -362,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 */
     }
 }
@@ -396,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);
@@ -408,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);
@@ -423,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);
@@ -434,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);
@@ -493,9 +461,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");
     fprintf(header_file, "#undef INITIALIZE\n");