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

diff --git a/advent.h b/advent.h
index d235707..b011e96 100644
--- a/advent.h
+++ b/advent.h
@@ -184,17 +184,14 @@ struct settings_t {
 };
 
 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;
 };