Proof of concept for Section 3 report generator.

[open-adventure.git] / dungeon.c

diff --git a/dungeon.c b/dungeon.c
index 00cccd2c9bfa91a527e4dca612b57134c8ab0b85..35ffbd4aa878e2e269551dd7b37499053d9abbe0 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -60,34 +60,12 @@
  *     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,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)
@@ -318,8 +294,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 */
     }
 }
 
@@ -493,8 +468,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");