X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=71b281ef8460f4e93d4038b89cccbf4226f1e0df;hb=6e6722220613eae112a683e722a0e78d4b426455;hp=8ef2f5b59c950b0471e3159f675d73b392324ae2;hpb=f03bde268ebb52455d4ca728ce043e2bddedae22;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 8ef2f5b..71b281e 100644
--- a/advent.h
+++ b/advent.h
@@ -181,24 +181,23 @@ 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];
 };
 
 extern struct game_t game;
 extern struct settings_t settings;
 
-extern char* xstrdup(const char* s);
-extern void* xmalloc(size_t size);
 extern void packed_to_token(long, char token[]);
-extern long token_to_packed(const char token[TOKLEN+1]);
+extern long token_to_packed(const char token[]);
 extern void tokenize(char*, struct command_t *);
 extern void vspeak(const char*, bool, va_list);
 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*);