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_TOP,
GO_CLEAROBJ,
GO_CHECKHINT,
- GO_DIRECTION,
GO_WORD2,
- GO_SPECIALS,
GO_UNKNOWN,
- GO_ACTION,
GO_DWARFWAKE,
};
bool prompt;
};
+typedef struct {
+ vocab_t id;
+ word_type_t type;
+} command_word_t;
+
struct command_t {
char raw1[LINESIZE], raw2[LINESIZE];
enum speechpart part;
vocab_t id1;
vocab_t id2;
- enum wordtype type1;
- enum wordtype type2;
+ word_type_t type1;
+ word_type_t type2;
verb_t verb;
obj_t obj;
};
extern int resume(void);
extern int restore(FILE *);
extern long initialise(void);
-extern int action(struct command_t *command);
+extern int action(struct command_t command);
extern void state_change(obj_t, int);