X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=f5fe672039d37ac9d76be6c94c4dfcbc59cac640;hp=8ef8736eefee3bed066cd10fc6fbcabefaebc436;hb=cfa37c83a7e026d30f707ecd1c9e3481b0ffde9f;hpb=7c3f834bca40b41d7d799f72122559ecf163b6f3 diff --git a/advent.h b/advent.h index 8ef8736..f5fe672 100644 --- a/advent.h +++ b/advent.h @@ -87,7 +87,7 @@ enum termination {endgame, quitgame, scoregame}; enum speechpart {unknown, intransitive, transitive}; -enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL}; +typedef enum {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t; typedef enum scorebonus {none, splatter, defeat, victory} score_t; @@ -101,28 +101,25 @@ enum phase_codes { GO_TOP, GO_CLEAROBJ, GO_CHECKHINT, - GO_DIRECTION, GO_WORD2, - GO_SPECIALS, GO_UNKNOWN, - GO_ACTION, GO_DWARFWAKE, }; -typedef long token_t; // token index */ 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 */ +typedef long turn_t; // turn counter or threshold */ struct game_t { unsigned long lcg_a, lcg_c, lcg_m, lcg_x; long abbnum; // How often to print long descriptions score_t bonus; // What kind of finishing bonus we are getting - long chloc; // pirate chest location - long chloc2; // pirate chest alternate location - long clock1; // # turns from finding last treasure to close - long clock2; // # turns from warning till blinding flash + loc_t chloc; // pirate chest location + loc_t chloc2; // pirate chest alternate location + turn_t clock1; // # turns from finding last treasure to close + turn_t clock2; // # turns from warning till blinding flash 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 @@ -144,12 +141,12 @@ struct game_t { 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 - long limit; // lifetime of lamp (not set here) + 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? - long numdie; // number of times killed so far + turn_t numdie; // number of times killed so far loc_t oldloc; // where player was loc_t oldlc2; // where player was two moves ago obj_t oldobj; // last object player handled @@ -157,9 +154,9 @@ struct game_t { long saved; // point penalty for saves long tally; // count of treasures gained long thresh; // current threshold for endgame scoring tier - long trndex; // FIXME: not used, remove on next format bump - long trnluz; // # points lost so far due to turns used - long turns; // counts commands given (ignores yes/no) + 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? @@ -186,24 +183,25 @@ struct settings_t { bool prompt; }; -struct command_t { +typedef struct { + char raw[LINESIZE]; + vocab_t id; + word_type_t type; +} command_word_t; + +typedef struct { enum speechpart part; + command_word_t word[2]; verb_t verb; obj_t obj; - token_t id1; - token_t id2; - char raw1[LINESIZE], raw2[LINESIZE]; - enum wordtype type1; - enum wordtype type2; -}; +} command_t; extern struct game_t game; extern struct settings_t settings; -extern bool get_command_input(struct command_t *); -extern void wordclear(token_t *); +extern bool get_command_input(command_t *); extern void speak(const char*, ...); -extern void sspeak(long msg, ...); +extern void sspeak(int msg, ...); extern void pspeak(vocab_t, enum speaktype, int, bool, ...); extern void rspeak(vocab_t, ...); extern void echo_input(FILE*, const char*, const char*); @@ -211,15 +209,13 @@ extern bool silent_yes(void); extern bool yes(const char*, const char*, const char*); extern void juggle(obj_t); extern void move(obj_t, loc_t); -extern long put(obj_t, long, long); +extern loc_t 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 int atdwrf(loc_t); +extern long setbit(int); extern bool tstbit(long, int); -extern void make_zzword(char*); extern void set_seed(long); -extern unsigned long get_next_lcg_value(void); extern long randrange(long); extern long score(enum termination); extern void terminate(enum termination) __attribute__((noreturn)); @@ -228,10 +224,17 @@ extern int suspend(void); extern int resume(void); extern int restore(FILE *); extern long initialise(void); -extern int action(struct command_t *command); -extern void state_change(obj_t, long); +extern int action(command_t command); +extern void state_change(obj_t, int); 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, +}; + /* end */