X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=3ed084ffa85a269c248f28d8e25929c4863764fb;hp=b9f24fe23248fba323031bbcd166ed7d03065c35;hb=a167945e1963c5fdf4d2ad0283d249cb35d28508;hpb=9b585f40d815b2f7ff0bfa8bed7892002bd7014f

diff --git a/advent.h b/advent.h
index b9f24fe..3ed084f 100644
--- a/advent.h
+++ b/advent.h
@@ -102,7 +102,6 @@ enum phase_codes {
     GO_CLEAROBJ,
     GO_CHECKHINT,
     GO_DIRECTION,
-    GO_LOOKUP,
     GO_WORD2,
     GO_SPECIALS,
     GO_UNKNOWN,
@@ -191,10 +190,8 @@ struct command_t {
     enum speechpart part;
     verb_t verb;
     obj_t   obj;
-    token_t wd1;
-    token_t wd2;
-    long id1;
-    long id2;
+    token_t id1;
+    token_t id2;
     char raw1[LINESIZE], raw2[LINESIZE];
     enum wordtype type1;
     enum wordtype type2;
@@ -203,25 +200,15 @@ struct command_t {
 extern struct game_t game;
 extern struct settings_t settings;
 
-extern void packed_to_token(long, char token[]);
-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 get_command_input(struct command_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*);
-extern int word_count(char*);
-extern char* get_input(void);
 extern bool silent_yes(void);
 extern bool yes(const char*, const char*, const char*);
-extern int get_motion_vocab_id(const char*);
-extern int get_object_vocab_id(const char*);
-extern int get_action_vocab_id(const char*);
-extern int get_special_vocab_id(const char*);
-extern void get_vocab_metadata(const char*, long*, enum wordtype*);
 extern void juggle(obj_t);
 extern void move(obj_t, loc_t);
 extern long put(obj_t, long, long);