archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-22 17:49:06 -04:00
parent 7f7f49b739
commit 51494657fd
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
advent.h
View file

@ -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)