X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=3015d65d1f2b65b3768dc5c070b697c08dbb6559;hp=ac648fecc454317b87847c96b7e4a1ddddfde28b;hb=12b2ff74f6bbca81dc04e359f2209fe3a442e0df;hpb=0a87fc9f78c40354068749f93cbbed80e217cd88 diff --git a/advent.h b/advent.h index ac648fe..3015d65 100644 --- a/advent.h +++ b/advent.h @@ -6,12 +6,12 @@ #include "dungeon.h" #define LINESIZE 1024 +#define TOKLEN 5 // № sigificant characters in a token */ #define NDWARVES 6 // number of dwarves #define PIRATE NDWARVES // must be NDWARVES-1 when zero-origin #define DALTLC LOC_NUGGET // alternate dwarf location -#define INVLIMIT 7 // inverntory limit (# of objects) +#define INVLIMIT 7 // inverntory limit (№ of objects) #define INTRANSITIVE -1 // illegal object number -#define SPECIALBASE 300 // base number of special rooms #define GAMELIMIT 330 // base limit of turns #define NOVICELIMIT 1000 // limit of turns for novice #define WARNTIME 30 // late game starts at game.limit-this @@ -19,10 +19,25 @@ #define PANICTIME 15 // time left after closing #define BATTERYLIFE 2500 // turn limit increment from batteries #define WORD_NOT_FOUND -1 // "Word not found" flag value for the vocab hash functions. +#define WORD_EMPTY 0 // "Word empty" flag value for the vocab hash functions #define CARRIED -1 // Player is toting it #define READ_MODE "rb" // b is not needed for POSIX but harmless #define WRITE_MODE "wb" // b is not needed for POSIX but harmless +/* Special object-state values - integers > 0 are object-specific */ +#define STATE_NOTFOUND -1 // 'Not found" state of treasures */ +#define STATE_FOUND 0 // After discovered, before messed with +#define STATE_IN_CAVITY 1 // State value common to all gemstones + +/* Special fixed object-state values - integers > 0 are location */ +#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, + * which has its own meaning. */ +#define STASHED(obj) (-1 - game.prop[obj]) + /* * MOD(N,M) = Arithmetic modulus * AT(OBJ) = true if on either side of two-placed object @@ -41,19 +56,23 @@ #define TOTING(OBJ) (game.place[OBJ] == CARRIED) #define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc) #define HERE(OBJ) (AT(OBJ) || TOTING(OBJ)) -#define LIQ2(PBOTL) ((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL)) -#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 LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == 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) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP))) +#define DARK(DUMMY) (!CNDBIT(game.loc,COND_LIT) && (game.prop[LAMP] == 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) -#define SPECIAL(LOC) ((LOC) > SPECIALBASE) #define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC)) #define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC)) #define BUG(x) bug(x, #x) +#define MOTION_WORD(n) ((n) + 0) +#define OBJECT_WORD(n) ((n) + 1000) +#define ACTION_WORD(n) ((n) + 2000) +#define SPECIAL_WORD(n) ((n) + 3000) +#define PROMOTE_WORD(n) ((n) + 1000) +#define DEMOTE_WORD(n) ((n) - 1000) enum bugtype { SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST, @@ -93,13 +112,15 @@ enum phase_codes { GO_DWARFWAKE, }; -typedef long token_t; // word token - someday this will be char[TOKLEN+1] +typedef long token_t; // word token - someday this will be char[TOKLEN+1] */ typedef long vocab_t; // index into a vocabulary array */ +typedef long verb_t; // index into an actions array */ +typedef long obj_t; // index into the object array */ +typedef long loc_t; // index into the locations array */ struct game_t { unsigned long lcg_a, lcg_c, lcg_m, lcg_x; long abbnum; // How often to print non-abbreviated descriptions - long blklin; long bonus; long chloc; long chloc2; @@ -123,6 +144,7 @@ struct game_t { long dtotal; long foobar; // current progress in saying "FEE FIE FOE FOO". long holdng; // number of objects being carried + long igo; // How many times he's said "go" instead of the direction long iwest; // How many times he's said "west" instead of "w" long knfloc; // 0 if no knife here, loc if knife , -1 after caveat long limit; // lifetime of lamp (not set here) @@ -139,49 +161,60 @@ struct game_t { long tally; long thresh; long trndex; - long trnluz; // # points lost so far due to number of turns used + long trnluz; // № points lost so far due to number of turns used long turns; // how many commands he's given (ignores yes/no) bool wzdark; // whether the loc he's leaving was dark - char zzword[6]; // randomly generated magic word from bird + char zzword[TOKLEN + 1]; // randomly generated magic word from bird bool blooded; // has player drunk of dragon's blood? long abbrev[NLOCATIONS + 1]; long atloc[NLOCATIONS + 1]; long dseen[NDWARVES + 1]; // true if dwarf has seen him - long dloc[NDWARVES + 1]; // location of dwarves, initially hard-wired in - long odloc[NDWARVES + 1]; // prior loc of each dwarf, initially garbage - long fixed[NOBJECTS + 1]; + 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]; long link[NOBJECTS * 2 + 1]; - long place[NOBJECTS + 1]; + loc_t place[NOBJECTS + 1]; long hinted[NHINTS]; // hintlc[i] is how long he's been at LOC with cond bit i long hintlc[NHINTS]; // hinted[i] is true iff hint i has been used. long prop[NOBJECTS + 1]; }; +/* + * Game application settings - settings, but not state of the game, per se. + * This data is not saved in a saved game. + */ +struct settings_t { + FILE *logfp; + bool oldstyle; + bool prompt; +}; + struct command_t { enum speechpart part; - vocab_t verb; - vocab_t obj; - token_t wd1, wd1x; - token_t wd2, wd2x; + verb_t verb; + obj_t obj; + token_t wd1; + token_t wd2; + long id1; + long id2; + char raw1[LINESIZE], raw2[LINESIZE]; }; extern struct game_t game; -extern FILE *logfp; -extern bool oldstyle, editline, prompt; +extern struct settings_t settings; -extern char* xstrdup(const char* s); -extern void* xmalloc(size_t size); extern void packed_to_token(long, char token[]); -extern long token_to_packed(const char token[6]); -extern void tokenize(char*, long tokens[4]); -extern void vspeak(const char*, va_list); +extern long token_to_packed(const char token[]); +extern void tokenize(char*, struct command_t *); +extern void vspeak(const char*, bool, va_list); 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, enum speaktype, int, ...); +extern void sspeak(long msg, ...); +extern void pspeak(vocab_t, enum speaktype, int, bool, ...); extern void rspeak(vocab_t, ...); -extern void echo_input(FILE*, char*, char*); +extern void echo_input(FILE*, const char*, const char*); extern int word_count(char*); extern char* get_input(void); extern bool silent_yes(void); @@ -191,16 +224,15 @@ extern int get_object_vocab_id(const char*); extern int get_action_vocab_id(const char*); extern int get_special_vocab_id(const char*); extern long get_vocab_id(const char*); -extern void juggle(long); -extern void move(long, long); -extern long put(long, long, long); -extern void carry(long, long); -extern void drop(long, long); -extern long atdwrf(long); +extern void juggle(obj_t); +extern void move(obj_t, loc_t); +extern long put(obj_t, long, long); +extern void carry(obj_t, loc_t); +extern void drop(obj_t, loc_t); +extern long atdwrf(loc_t); extern long setbit(long); extern bool tstbit(long, int); extern void make_zzword(char*); -extern void datime(long*, long*); extern void set_seed(long); extern unsigned long get_next_lcg_value(void); extern long randrange(long); @@ -210,10 +242,11 @@ extern int savefile(FILE *, long); extern int suspend(void); extern int resume(void); extern int restore(FILE *); -extern void initialise(void); +extern long initialise(void); extern int action(struct command_t *command); +extern void state_change(obj_t, long); + -/* Alas, declaring this static confuses the coverage analyzer */ void bug(enum bugtype, const char *) __attribute__((__noreturn__)); /* end */