Upgrade get_vocab_id() to handle empty strings.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 61d3e4e42957708191ca6fe8a44445554bafec64..72af32f58592371f62727ad96584e7fea9d307f9 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -20,6 +20,7 @@
 #define PANICTIME      15         // time left after closing
 #define BATTERYLIFE    2500       // turn limit increment from batteries
 #define WORD_NOT_FOUND -1         // "Word not found" flag value for the vocab hash functions.
+#define WORD_EMPTY     0          // "Word empty" flag value for the vocab hash functions
 #define CARRIED        -1         // Player is toting it
 #define READ_MODE      "rb"       // b is not needed for POSIX but harmless
 #define WRITE_MODE     "wb"       // b is not needed for POSIX but harmless
@@ -189,10 +190,8 @@ struct command_t {
 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);