Simplify command word handling.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index d2357070a6e891d4511b32a1ffccaec9b843beee..1e7a0962f65d7684f1df8cd1f193d4512af7da49 100644 (file)
--- 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;
 };
@@ -233,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 */