X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=47688656260292377df2c8fdbc34aa7ae502be7e;hp=62d3696e3d924877513b85b4613af9e85e1fc227;hb=8bd947b54d365f4e8a119be761021be055ea8748;hpb=2fa530340d65c636fb297aee5df5805393f08d31

diff --git a/advent.h b/advent.h
index 62d3696..4768865 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*, ...);