X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=d2357070a6e891d4511b32a1ffccaec9b843beee;hp=ce763faa707882ec74f59eed461d9e2080a9bb48;hb=a15e7c9f91dc3597896536658d7ffa5eda9e940f;hpb=a00229050aa9af4685b6e42ec89f436da30414c2

diff --git a/advent.h b/advent.h
index ce763fa..d235707 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, NUMERIC};
+typedef enum {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t;
 
 typedef enum scorebonus {none, splatter, defeat, victory} score_t;
 
@@ -183,13 +183,18 @@ struct settings_t {
     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;
 };