X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=1e7a0962f65d7684f1df8cd1f193d4512af7da49;hb=5c30d6429f4f5e3d187d52b6ac623d61968738a4;hp=2e07c7ef26d30c176905f6740c890c261546b7e6;hpb=0d3393ebee2cfa97cd7b51daf0448992df758594;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 2e07c7e..1e7a096 100644
--- a/advent.h
+++ b/advent.h
@@ -183,13 +183,15 @@ struct settings_t {
     bool prompt;
 };
 
+typedef struct {
+  char raw[LINESIZE];
+  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;
-    word_type_t type1;
-    word_type_t type2;
+    command_word_t word[2];
     verb_t verb;
     obj_t   obj;
 };
@@ -228,4 +230,11 @@ 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 */