Give the FORCED property a real cond bit. Delete some unused code.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index f52ea8e3ea4b432c3636a1bf79452e0c8cb2d516..94fbd88877ca162c310e0cd9f37e5a405460c9bf 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -151,7 +151,7 @@ extern int restore(FILE *);
 #define LIQUID()       (LIQ2(game.prop[BOTTLE]<0 ? -1-game.prop[BOTTLE] : game.prop[BOTTLE]))
 #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)    (conditions[LOC] == 2)
+#define FORCED(LOC)    CNDBIT(LOC, COND_FORCED)
 #define DARK(DUMMY)    ((!TSTBIT(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N)         (randrange(100) < (N))
 #define GSTONE(OBJ)    ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)