Stop overwriting obj by dragon check

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 34f44157eb575251d93821857c671ef713680a86..7754923f5913c2f299df667ff0b59323d21e625b 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -114,8 +114,9 @@ enum phase_codes {
     GO_DWARFWAKE,
 };
 
-typedef long token_t;  // word token - someday this will be char[TOKLEN+1]
+typedef long token_t;  // word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;  // index into a vocabulary array */
+typedef long verb_t;   // index into an actions array */
 typedef long obj_t;    // index into the object array */
 typedef long loc_t;    // index into the locations array */
 
@@ -191,8 +192,8 @@ struct settings_t {
 
 struct command_t {
     enum speechpart part;
-    vocab_t verb;
-    vocab_t obj;
+    verb_t verb;
+    obj_t   obj;
     token_t wd1;
     token_t wd2;
     long id1;