X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=63b16ffa0155707543dd67dcd2a49c880df442d9;hb=64035d00262d3b10c126748be659d22394b7ed3b;hp=b642fbf6dccf26441cfd053d2ae91060f495f800;hpb=ecff53d3a8322224bafe0c2a4cffc3e32840e82a;p=open-adventure.git diff --git a/advent.h b/advent.h index b642fbf..63b16ff 100644 --- a/advent.h +++ b/advent.h @@ -63,6 +63,7 @@ struct game_t { long turns; bool wzdark; /* whether the loc he's leaving was dark */ long zzword; + bool blooded; /* has player drunk of dragon's blood? */ long abbrev[LOCSIZ + 1]; long atloc[LOCSIZ + 1]; long dseen[NDWARVES + 1]; @@ -71,8 +72,8 @@ struct game_t { long fixed[NOBJECTS + 1]; long link[NOBJECTS * 2 + 1]; long place[NOBJECTS + 1]; - long hinted[HINT_COUNT]; - long hintlc[HINT_COUNT]; + long hinted[NHINTS]; + long hintlc[NHINTS]; long prop[NOBJECTS + 1]; }; @@ -85,6 +86,8 @@ extern const char advent_to_ascii[]; extern FILE *logfp; extern bool oldstyle, editline, prompt; +enum speaktype {touch, look, hear, study}; + /* b is not needed for POSIX but harmless */ #define READ_MODE "rb" #define WRITE_MODE "wb" @@ -96,7 +99,7 @@ extern bool wordeq(token_t, token_t); extern bool wordempty(token_t); extern void wordclear(token_t *); extern void speak(const char*, ...); -extern void pspeak(vocab_t, int, ...); +extern void pspeak(vocab_t, enum speaktype, int, ...); extern void rspeak(vocab_t, ...); extern bool GETIN(FILE *, token_t*, token_t*, token_t*, token_t*); extern void echo_input(FILE*, char*, char*);