X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=379bb53190e9d0419ea61d1d405658259df0f2e3;hb=25077d0b4eb1d6a85140c01092be7203ca64a49c;hp=f231569f5620ec7ae7467d14940748b99cec42a9;hpb=6c6c72f327b7559f5b430b486a1a98137789e8ea;p=open-adventure.git

diff --git a/advent.h b/advent.h
index f231569..379bb53 100644
--- a/advent.h
+++ b/advent.h
@@ -63,16 +63,17 @@ struct game_t {
     long turns;
     bool wzdark;	/* whether the loc he's leaving was dark */
     long zzword;
-    long abbrev[LOCSIZ + 1];
-    long atloc[LOCSIZ + 1];
+    bool blooded;	/* has player drunk of dragon's blood? */
+    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];
 };
 
@@ -85,6 +86,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"
@@ -96,7 +99,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*);
@@ -152,7 +155,7 @@ extern int restore(FILE *);
 #define LIQLOC(LOC)	(LIQ2((MOD(conditions[LOC]/2*2,8)-5)*MOD(conditions[LOC]/4,2)+1))
 #define CNDBIT(L,N)	(TSTBIT(conditions[L],N))
 #define FORCED(LOC)	CNDBIT(LOC, COND_FORCED)
-#define DARK(DUMMY)	((!TSTBIT(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define DARK(DUMMY)	((!TSTBIT(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
 #define PCT(N)		(randrange(100) < (N))
 #define GSTONE(OBJ)	((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)	CNDBIT(LOC, COND_FOREST)