X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=b058797396038e34e20dfc525e79b711860b8a17;hb=535d9e7964e0033d42f01639ac9dc0e3b169d956;hp=7eb54dc744d3e694edf5055b252b0a55e843047a;hpb=3d2ba1835544af309723e7502d0311d5f14ec99d;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 7eb54dc..b058797 100644
--- a/advent.h
+++ b/advent.h
@@ -101,9 +101,7 @@ enum phase_codes {
     GO_TOP,
     GO_CLEAROBJ,
     GO_CHECKHINT,
-    GO_CHECKFOO,
     GO_DIRECTION,
-    GO_LOOKUP,
     GO_WORD2,
     GO_SPECIALS,
     GO_UNKNOWN,
@@ -119,8 +117,8 @@ typedef long loc_t;    // index into the locations array */
 
 struct game_t {
     unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
-    long abbnum;                 // How often to print non-abbreviated descriptions
-    score_t bonus;                  // What kind of bonus we are getting for finishing the game
+    long abbnum;                 // How often to print long descriptions
+    score_t bonus;               // What kind of finishing bonus we are getting
     long chloc;
     long chloc2;
     long clock1;                 // # turns from finding last treasure till closing
@@ -128,7 +126,7 @@ struct game_t {
     bool clshnt;                 // has player read the clue in the endgame?
     bool closed;                 // whether we're all the way closed
     bool closng;                 // whether it's closing time yet
-    long conds;                  // min value for cond(loc) if loc has any hints
+    long conds;                  // min value for cond[loc] if loc has any hints
     long detail;
 
     /*  dflag controls the level of activation of dwarves:
@@ -155,26 +153,27 @@ struct game_t {
     long oldloc;
     long oldlc2;
     long oldobj;
-    bool panic;                  // has player found out he's trapped in the cave?
+    bool panic;                  // has player found out he's trapped?
     long saved;                  // point penalty for saves
     long tally;
     long thresh;
     long trndex;
-    long trnluz;                 // № points lost so far due to number of turns used
-    long turns;                  // how many commands he's given (ignores yes/no)
+    long trnluz;                 // # points lost so far due to turns used
+    long turns;                  // counts commands given (ignores yes/no)
     bool wzdark;                 // whether the loc he's leaving was dark
     char zzword[TOKLEN + 1];     // randomly generated magic word from bird
     bool blooded;                // has player drunk of dragon's blood?
     long abbrev[NLOCATIONS + 1];
     long atloc[NLOCATIONS + 1];
     long dseen[NDWARVES + 1];    // true if dwarf has seen him
-    loc_t dloc[NDWARVES + 1];     // location of dwarves, initially hard-wired in
-    loc_t odloc[NDWARVES + 1];    // prior loc of each dwarf, initially garbage
+    loc_t dloc[NDWARVES + 1];    // location of dwarves, initially hard-wired in
+    loc_t odloc[NDWARVES + 1];   // prior loc of each dwarf, initially garbage
     loc_t fixed[NOBJECTS + 1];
     long link[NOBJECTS * 2 + 1];
     loc_t place[NOBJECTS + 1];
-    long hinted[NHINTS];         // hintlc[i] is how long he's been at LOC with cond bit i
-    long hintlc[NHINTS];         // hinted[i] is true iff hint i has been used.
+    long hinted[NHINTS];         // hinted[i] = true iff hint i has been used.
+    long hintlc[NHINTS];         // hintlc[i] = how long at LOC with cond bit i
+
     long prop[NOBJECTS + 1];
 };
 
@@ -192,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;
@@ -204,26 +201,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 wordempty(token_t);
+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);