X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=48cb54e16fccf86980025e3313359172236eeb4c;hp=321e0363417c332f079e4a00da1ad0cb930eaa98;hb=e3b508536d825ffd795b1b25abebc3ae8b800078;hpb=a4c87aa0b34b476b14f963a2ecbdd8797bcfed63

diff --git a/advent.h b/advent.h
index 321e036..48cb54e 100644
--- a/advent.h
+++ b/advent.h
@@ -108,8 +108,6 @@ enum phase_codes {
     GO_TOP,
     GO_CLEAROBJ,
     GO_CHECKHINT,
-    GO_CHECKFOO,
-    GO_LOOKUP,
     GO_WORD2,
     GO_UNKNOWN,
     GO_DWARFWAKE,
@@ -198,11 +196,14 @@ typedef struct {
     word_type_t type;
 } command_word_t;
 
+typedef enum {EMPTY, RAW, TOKENIZED, GIVEN, PREPROCESSED, PROCESSING, EXECUTED} command_state_t;
+
 typedef struct {
     enum speechpart part;
     command_word_t word[2];
     verb_t verb;
-    obj_t   obj;
+    obj_t obj;
+    command_state_t state;
 } command_t;
 
 extern struct game_t game;
@@ -211,7 +212,7 @@ extern struct settings_t settings;
 extern bool get_command_input(command_t *);
 extern void speak(const char*, ...);
 extern void sspeak(int msg, ...);
-extern void pspeak(vocab_t, enum speaktype, int, bool, ...);
+extern void pspeak(vocab_t, enum speaktype, bool, int, ...);
 extern void rspeak(vocab_t, ...);
 extern void echo_input(FILE*, const char*, const char*);
 extern bool silent_yes(void);
@@ -233,7 +234,7 @@ extern int suspend(void);
 extern int resume(void);
 extern int restore(FILE *);
 extern long initialise(void);
-extern int action(command_t command);
+extern int action(command_t);
 extern void state_change(obj_t, int);
 extern bool is_valid(struct game_t);