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;
GO_MOVE,
GO_TOP,
GO_CLEAROBJ,
- GO_CHECKHINT,
- GO_DIRECTION,
GO_WORD2,
- GO_SPECIALS,
GO_UNKNOWN,
- GO_ACTION,
GO_DWARFWAKE,
};
bool prompt;
};
-struct command_t {
- char raw1[LINESIZE], raw2[LINESIZE];
+typedef struct {
+ char raw[LINESIZE];
+ vocab_t id;
+ word_type_t type;
+} command_word_t;
+
+typedef struct {
enum speechpart part;
- vocab_t id1;
- vocab_t id2;
- enum wordtype type1;
- enum wordtype type2;
+ 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, ...);
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 */