X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=71b281ef8460f4e93d4038b89cccbf4226f1e0df;hp=560b15010854fa7f5d389c78b8177da8f8ccba32;hb=1c4fcaf43edea3d1a29fe6f4949f6397c314c67e;hpb=a768555312f0ff1c0ddb11ae5e6212210535110c

diff --git a/advent.h b/advent.h
index 560b150..71b281e 100644
--- a/advent.h
+++ b/advent.h
@@ -181,18 +181,16 @@ 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);