X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=788d65934e8b88cea5019e40136927f5ed261456;hp=1e7a0962f65d7684f1df8cd1f193d4512af7da49;hb=9e2cb3c19196a26af8e20803314f42b69dc0e014;hpb=5c30d6429f4f5e3d187d52b6ac623d61968738a4 diff --git a/advent.h b/advent.h index 1e7a096..788d659 100644 --- a/advent.h +++ b/advent.h @@ -2,9 +2,16 @@ #include #include #include +#include #include "dungeon.h" +/* 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 LINESIZE 1024 #define TOKLEN 5 // № sigificant characters in a token */ #define NDWARVES 6 // number of dwarves @@ -100,7 +107,6 @@ enum phase_codes { GO_MOVE, GO_TOP, GO_CLEAROBJ, - GO_CHECKHINT, GO_WORD2, GO_UNKNOWN, GO_DWARFWAKE, @@ -113,7 +119,7 @@ typedef long loc_t; // index into the locations array */ typedef long turn_t; // turn counter or threshold */ struct game_t { - unsigned long lcg_a, lcg_c, lcg_m, lcg_x; + int64_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 @@ -123,6 +129,11 @@ struct game_t { bool clshnt; // has player read the clue in the endgame? bool closed; // whether we're all the way closed bool closng; // whether it's closing time yet + bool lmwarn; // has player been warned about lamp going dim? + bool novice; // asked for instructions at start-up? + bool panic; // has player found out he's trapped? + bool wzdark; // whether the loc he's leaving was dark + bool blooded; // has player drunk of dragon's blood? long conds; // min value for cond[loc] if loc has any hints long detail; // level of detail in descriptions @@ -135,38 +146,33 @@ struct game_t { long dflag; long dkill; // dwarves killed - long dtotal; // total dwarves (including pirate) + long dtotal; // total dwarves (including pirate) in loc long foobar; // progress in saying "FEE FIE FOE FOO". long holdng; // number of objects being carried long igo; // # uses of "go" instead of a direction long iwest; // # times he's said "west" instead of "w" long knfloc; // knife location; 0 if none, -1 after caveat turn_t limit; // lifetime of lamp - bool lmwarn; // has player been warned about lamp going dim? loc_t loc; // where player is now loc_t newloc; // where player is going - bool novice; // asked for instructions at start-up? turn_t numdie; // number of times killed so far loc_t oldloc; // where player was - loc_t oldlc2; // where player was two moves ago + loc_t oldlc2; // where player was two moves ago obj_t oldobj; // last object player handled - bool panic; // has player found out he's trapped? long saved; // point penalty for saves long tally; // count of treasures gained long thresh; // current threshold for endgame scoring tier turn_t trndex; // FIXME: not used, remove on next format bump turn_t trnluz; // # points lost so far due to turns used turn_t turns; // counts commands given (ignores yes/no) - bool wzdark; // whether the loc he's leaving was dark char zzword[TOKLEN + 1]; // randomly generated magic word from bird - bool blooded; // has player drunk of dragon's blood? long abbrev[NLOCATIONS + 1]; // has location been seen? long atloc[NLOCATIONS + 1]; // head of object linked list per location long 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) - long link[NOBJECTS * 2 + 1]; // object-list links + obj_t link[NOBJECTS * 2 + 1]; // object-list links loc_t place[NOBJECTS + 1]; // location of object long hinted[NHINTS]; // hinted[i] = true iff hint i has been used. long hintlc[NHINTS]; // hintlc[i] = how long at LOC with cond bit i @@ -184,22 +190,22 @@ struct settings_t { }; typedef struct { - char raw[LINESIZE]; - vocab_t id; - word_type_t type; + char raw[LINESIZE]; + vocab_t id; + word_type_t type; } command_word_t; -struct command_t { +typedef struct { enum speechpart part; command_word_t word[2]; verb_t verb; obj_t obj; -}; +} command_t; extern struct game_t game; extern struct settings_t settings; -extern bool get_command_input(struct command_t *); +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, ...); @@ -215,16 +221,16 @@ extern void drop(obj_t, loc_t); extern int atdwrf(loc_t); extern long setbit(int); extern bool tstbit(long, int); -extern void set_seed(long); -extern long randrange(long); +extern void set_seed(int32_t); +extern int32_t randrange(int32_t); extern long score(enum termination); extern void terminate(enum termination) __attribute__((noreturn)); -extern int savefile(FILE *, long); +extern int savefile(FILE *, int32_t); extern int suspend(void); extern int resume(void); extern int restore(FILE *); extern long initialise(void); -extern int action(struct command_t command); +extern int action(command_t command); extern void state_change(obj_t, int); @@ -232,9 +238,9 @@ void bug(enum bugtype, const char *) __attribute__((__noreturn__)); /* represent an empty command word */ static const command_word_t empty_command_word = { - .raw = "", - .id = WORD_EMPTY, - .type = NO_WORD_TYPE, + .raw = "", + .id = WORD_EMPTY, + .type = NO_WORD_TYPE, }; /* end */