Abolish unclean operation on OBJSOUND - it's now static.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index f231569f5620ec7ae7467d14940748b99cec42a9..ce39df18f617129f0f0c8a036e1ac386f416a3a6 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -63,6 +63,7 @@ struct game_t {
     long turns;
     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 dseen[NDWARVES + 1];
@@ -152,7 +153,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)