Entirely eliminate wd1x and wd2x members of the command block.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 8ef2f5b59c950b0471e3159f675d73b392324ae2..61d3e4e42957708191ca6fe8a44445554bafec64 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -181,8 +181,8 @@ struct command_t {
     enum speechpart part;
     vocab_t verb;
     vocab_t obj;
-    token_t wd1, wd1x;
-    token_t wd2, wd2x;
+    token_t wd1;
+    token_t wd2;
     char raw1[BUFSIZ], raw2[BUFSIZ];
 };
 
@@ -199,6 +199,7 @@ extern bool wordeq(token_t, token_t);
 extern bool wordempty(token_t);
 extern void wordclear(token_t *);
 extern void speak(const char*, ...);
+extern void sspeak(long msg, ...);
 extern void pspeak(vocab_t, enum speaktype, int, bool, ...);
 extern void rspeak(vocab_t, ...);
 extern void echo_input(FILE*, const char*, const char*);