X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=b642fbf6dccf26441cfd053d2ae91060f495f800;hb=ecff53d3a8322224bafe0c2a4cffc3e32840e82a;hp=f231569f5620ec7ae7467d14940748b99cec42a9;hpb=6c6c72f327b7559f5b430b486a1a98137789e8ea;p=open-adventure.git diff --git a/advent.h b/advent.h index f231569..b642fbf 100644 --- a/advent.h +++ b/advent.h @@ -152,7 +152,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)