Replace magic MINTRS/MAXTRS with a treasure attribute in YAML.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index ce39df18f617129f0f0c8a036e1ac386f416a3a6..ba37940b53d26b14ebe777119051414c1c65e50e 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -9,8 +9,6 @@
 #define NDWARVES       6               /* number of dwarves */
 #define PIRATE         NDWARVES        /* must be NDWARVES-1 when zero-origin */
 #define DALTLC         LOC_NUGGET      /* alternate dwarf location */
-#define MINTRS         50              /* index of lowest reasure */
-#define MAXTRS         79              /* index of highest reasure */
 #define MAXPARMS       25              /* Max parameters for speak() */
 #define INVLIMIT       7               /* inverntory limit (# of objects) */
 #define INTRANSITIVE   -1              /* illegal object number */
@@ -64,16 +62,16 @@ struct game_t {
     bool wzdark;       /* whether the loc he's leaving was dark */
     long zzword;
     bool blooded;      /* has player drunk of dragon's blood? */
-    long abbrev[LOCSIZ + 1];
-    long atloc[LOCSIZ + 1];
+    long abbrev[NLOCATIONS + 1];
+    long atloc[NLOCATIONS + 1];
     long dseen[NDWARVES + 1];
     long dloc[NDWARVES + 1];
     long odloc[NDWARVES + 1];
     long fixed[NOBJECTS + 1];
     long link[NOBJECTS * 2 + 1];
     long place[NOBJECTS + 1];
-    long hinted[HINT_COUNT];
-    long hintlc[HINT_COUNT];
+    long hinted[NHINTS];
+    long hintlc[NHINTS];
     long prop[NOBJECTS + 1];
 };
 
@@ -86,6 +84,8 @@ extern const char advent_to_ascii[];
 extern FILE *logfp;
 extern bool oldstyle, editline, prompt;
 
+enum speaktype {touch, look, hear, study};
+
 /* b is not needed for POSIX but harmless */
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
@@ -97,7 +97,7 @@ extern bool wordeq(token_t, token_t);
 extern bool wordempty(token_t);
 extern void wordclear(token_t *);
 extern void speak(const char*, ...);
-extern void pspeak(vocab_t, int, ...);
+extern void pspeak(vocab_t, enum speaktype, int, ...);
 extern void rspeak(vocab_t, ...);
 extern bool GETIN(FILE *, token_t*, token_t*, token_t*, token_t*);
 extern void echo_input(FILE*, char*, char*);