X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=advent.h;h=94fbd88877ca162c310e0cd9f37e5a405460c9bf;hb=51494657fd3689a4202e3ed6db41f5bcded9e2c6;hp=f52ea8e3ea4b432c3636a1bf79452e0c8cb2d516;hpb=7f7f49b7396135f53e31c03d28ecc4d69b8b4584;p=open-adventure.git

diff --git a/advent.h b/advent.h
index f52ea8e..94fbd88 100644
--- 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)