X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=76d63e093ea24a0be018f222ceb0ba2384796e12;hb=6667ffd1f10e75ee4b75a3430d76e6f1b4e51090;hp=788d65934e8b88cea5019e40136927f5ed261456;hpb=9e2cb3c19196a26af8e20803314f42b69dc0e014;p=open-adventure.git diff --git a/advent.h b/advent.h index 788d659..76d63e0 100644 --- a/advent.h +++ b/advent.h @@ -8,9 +8,9 @@ /* LCG PRNG parameters tested against * Knuth vol. 2. by the original authors */ -#define LCG_A 1093 -#define LCG_C 221587 -#define LCG_M 1048576 +#define LCG_A 1093L +#define LCG_C 221587L +#define LCG_M 1048576L #define LINESIZE 1024 #define TOKLEN 5 // № sigificant characters in a token */ @@ -107,6 +107,7 @@ enum phase_codes { GO_MOVE, GO_TOP, GO_CLEAROBJ, + GO_CHECKHINT, GO_WORD2, GO_UNKNOWN, GO_DWARFWAKE, @@ -119,7 +120,7 @@ typedef long loc_t; // index into the locations array */ typedef long turn_t; // turn counter or threshold */ struct game_t { - int64_t lcg_x; + int32_t lcg_x; long abbnum; // How often to print long descriptions score_t bonus; // What kind of finishing bonus we are getting loc_t chloc; // pirate chest location @@ -208,7 +209,7 @@ extern struct settings_t settings; extern bool get_command_input(command_t *); extern void speak(const char*, ...); extern void sspeak(int msg, ...); -extern void pspeak(vocab_t, enum speaktype, int, bool, ...); +extern void pspeak(vocab_t, enum speaktype, bool, int, ...); extern void rspeak(vocab_t, ...); extern void echo_input(FILE*, const char*, const char*); extern bool silent_yes(void); @@ -230,9 +231,9 @@ extern int suspend(void); extern int resume(void); extern int restore(FILE *); extern long initialise(void); -extern int action(command_t command); +extern int action(command_t); extern void state_change(obj_t, int); - +extern bool is_valid(struct game_t); void bug(enum bugtype, const char *) __attribute__((__noreturn__));