X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=42491e7533c02db169945321e770a936524ce56c;hb=82c3ae5e65573b97f52d3c14986d45167fa8f884;hp=3cea5f569f9ac0ad7c5a54ca9c737460bf359a9c;hpb=4b08b726f9735b5a6a17e588753a496700ff25f7;p=open-adventure.git diff --git a/advent.h b/advent.h index 3cea5f5..42491e7 100644 --- a/advent.h +++ b/advent.h @@ -48,10 +48,31 @@ #define IS_FIXED -1 #define IS_FREE 0 -/* Map a state property value to a negative range, where the object cannot be - * picked up but the value can be recovered later. Avoid colliding with -1, +/* PROP_STASHED maps a state property value to a negative range, where the object + * cannot be picked up but the value can be recovered later. */ +#ifndef FOUNDBOOL +/* PROP_STASHED needs ro avoid colliding with -1, * which has its own meaning as STATE_NOTFOUND. */ -#define STASHED(obj) (-1 - game.prop[obj]) +#define PROP_STASHED(obj) (STATE_NOTFOUND - game.objects[obj].prop) +#define PROP_IS_STASHED(obj) (game.objects[obj].prop < STATE_NOTFOUND) +#define PROP_IS_NOTFOUND(obj) (game.objects[obj].prop == STATE_NOTFOUND) +#define PROP_IS_FOUND(obj) (game.objects[obj].prop == STATE_FOUND) +#define PROP_IS_STASHED_OR_UNSEEN(obj) (game.objects[obj].prop < 0) +#define PROP_SET_FOUND(obj) (game.objects[obj].prop = STATE_FOUND) +#define PROP_SET_NOT_FOUND(obj) (game.objects[obj].prop = STATE_NOTFOUND) +#define PROP_IS_NOTFOUND2(g, o) (g.objects[o].prop == STATE_NOTFOUND) +#else +#define PROP_STASHED(obj) (-game.objects[obj].prop) +#define PROP_IS_STASHED(obj) (game.objects[obj].prop < 0) +#define PROP_IS_NOTFOUND(obj) (!game.objects[obj].found) +#define PROP_IS_FOUND(obj) (game.objects[obj].found && game.objects[obj].prop == 0) +#define PROP_IS_STASHED_OR_UNSEEN(obj) (!game.objects[obj].found || game.objects[obj].prop < 0) +#define PROP_SET_FOUND(obj) do {game.objects[obj].found = true; game.objects[obj].prop = STATE_FOUND;} while(0) +#define PROP_SET_NOT_FOUND(obj) game.objects[obj].found = false +#define PROP_IS_NOTFOUND2(g, o) (!g.objects[o].found) +#endif +/* Magic number -2 allows a PROP_STASHED version of state 1 */ +#define PROP_IS_INVALID(val) (val < -2 || val > 1) #define PROMPT "> " @@ -76,14 +97,14 @@ */ #define DESTROY(N) move(N, LOC_NOWHERE) #define MOD(N,M) ((N) % (M)) -#define TOTING(OBJ) (game.place[OBJ] == CARRIED) -#define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc) +#define TOTING(OBJ) (game.objects[OBJ].place == CARRIED) +#define AT(OBJ) (game.objects[OBJ].place == game.loc || game.objects[OBJ].fixed == game.loc) #define HERE(OBJ) (AT(OBJ) || TOTING(OBJ)) #define CNDBIT(L,N) (tstbit(conditions[L],N)) -#define LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == OIL_BOTTLE ? OIL : NO_OBJECT ) +#define LIQUID() (game.objects[BOTTLE].prop == WATER_BOTTLE? WATER : game.objects[BOTTLE].prop == OIL_BOTTLE ? OIL : NO_OBJECT ) #define LIQLOC(LOC) (CNDBIT((LOC),COND_FLUID)? CNDBIT((LOC),COND_OILY) ? OIL : WATER : NO_OBJECT) #define FORCED(LOC) CNDBIT(LOC, COND_FORCED) -#define DARK(DUMMY) (!CNDBIT(game.loc,COND_LIT) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP))) +#define DARK(DUMMY) (!CNDBIT(game.loc,COND_LIT) && (game.objects[LAMP].prop == 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) @@ -167,7 +188,7 @@ struct game_t { int holdng; // number of objects being carried int igo; // # uses of "go" instead of a direction int iwest; // # times he's said "west" instead of "w" - int knfloc; // knife location; 0 if none, -1 after caveat + loc_t knfloc; // knife location; LOC_NOWERE if none, -1 after caveat turn_t limit; // lifetime of lamp loc_t loc; // where player is now loc_t newloc; // where player is going @@ -178,21 +199,36 @@ struct game_t { int saved; // point penalty for saves int tally; // count of treasures gained int thresh; // current threshold for endgame scoring tier - bool seenbigwords; // have we red the grafitti in the Giant's Room? + bool seenbigwords; // have we red the graffiti in the Giant's Room? turn_t trnluz; // # points lost so far due to turns used turn_t turns; // counts commands given (ignores yes/no) char zzword[TOKLEN + 1]; // randomly generated magic word from bird - int abbrev[NLOCATIONS + 1]; // has location been seen? - int atloc[NLOCATIONS + 1]; // head of object linked list per location - int dseen[NDWARVES + 1]; // true if dwarf has seen him - loc_t dloc[NDWARVES + 1]; // location of dwarves, initially hard-wired in - loc_t odloc[NDWARVES + 1]; // prior loc of each dwarf, initially garbage - loc_t fixed[NOBJECTS + 1]; // fixed location of object (if not IS_FREE) + struct { + int abbrev; // has location been seen? + int atloc; // head of object linked list per location + } locs[NLOCATIONS + 1]; + struct { + int seen; // true if dwarf has seen him + loc_t loc; // location of dwarves, initially hard-wired in + loc_t oldloc; // prior loc of each dwarf, initially garbage + } dwarves[NDWARVES + 1]; + struct { +#ifdef FOUNDBOOL + bool found; // has the location of this object bween found? +#endif + loc_t fixed; // fixed location of object (if not IS_FREE) + int prop; // object state */ + loc_t place; // location of object + } objects[NOBJECTS + 1]; + struct { + bool used; // hints[i].used = true iff hint i has been used. +#ifndef FOUNDBOOL + int lc; // hints[i].lc = show int at LOC with cond bit i +#else + int lc; // hints[i].lc = show int at LOC with cond bit i +#endif + } hints[NHINTS]; obj_t link[NOBJECTS * 2 + 1];// object-list links - loc_t place[NOBJECTS + 1]; // location of object - int hinted[NHINTS]; // hinted[i] = true iff hint i has been used. - int hintlc[NHINTS]; // hintlc[i] = how int at LOC with cond bit i - int prop[NOBJECTS + 1]; // object state array */ }; /* @@ -236,7 +272,7 @@ typedef struct { #define SAVE_VERSION 30 /* - * Goes at start of gile so sabes can be identified by file(1) and the like. + * Goes at start of file so saves can be identified by file(1) and the like. */ #define ADVENT_MAGIC "open-adventure\n" @@ -268,7 +304,7 @@ extern bool silent_yes_or_no(void); extern bool yes_or_no(const char*, const char*, const char*); extern void juggle(obj_t); extern void move(obj_t, loc_t); -extern loc_t put(obj_t, loc_t, int); +extern void put(obj_t, loc_t, int); extern void carry(obj_t, loc_t); extern void drop(obj_t, loc_t); extern int atdwrf(loc_t);