X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=f5fe672039d37ac9d76be6c94c4dfcbc59cac640;hp=b011e96f9e7429fd623ba3d7e825ce582968d485;hb=cfa37c83a7e026d30f707ecd1c9e3481b0ffde9f;hpb=5c91ea37393dcad690ed03dc3afc56b593a1be1c diff --git a/advent.h b/advent.h index b011e96..f5fe672 100644 --- a/advent.h +++ b/advent.h @@ -189,17 +189,17 @@ typedef struct { 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, ...); @@ -224,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 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 */