X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=fc6ce9478ad8d77ed14dd2f53cc88e9f41ec219d;hb=4da9742cd28e87ea91d3a7b75e3d7147011b95e7;hp=62d3696e3d924877513b85b4613af9e85e1fc227;hpb=2fca59d9fd6a6c2240ce715d010995c614836999;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 62d3696..fc6ce94 100644
--- a/advent.h
+++ b/advent.h
@@ -191,10 +191,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,8 +201,6 @@ 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 wordclear(token_t *);
 extern void speak(const char*, ...);
@@ -216,10 +212,6 @@ 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);