Remove unused enum.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index c545f048f2f67a943957a10a26b994083ef3c851..36f086391264fc724f7941d4b2973ee4c767ec85 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -89,6 +89,8 @@ enum speechpart {unknown, intransitive, transitive};
 
 enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
 
+typedef enum scorebonus {none, splatter, defeat, victory} score_t;
+
 /* Phase codes for action returns.
  * These were at one time FORTRAN line numbers.
  * The values don't matter, but perturb their order at your peril.
@@ -99,9 +101,7 @@ enum phase_codes {
     GO_TOP,
     GO_CLEAROBJ,
     GO_CHECKHINT,
-    GO_CHECKFOO,
     GO_DIRECTION,
-    GO_LOOKUP,
     GO_WORD2,
     GO_SPECIALS,
     GO_UNKNOWN,
@@ -118,7 +118,7 @@ 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
-    long bonus;
+    score_t bonus;                  // What kind of bonus we are getting for finishing the game
     long chloc;
     long chloc2;
     long clock1;                 // # turns from finding last treasure till closing
@@ -190,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;
@@ -202,12 +200,7 @@ 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 wordeq(token_t, token_t);
-extern bool wordempty(token_t);
 extern void wordclear(token_t *);
 extern void speak(const char*, ...);
 extern void sspeak(long msg, ...);
@@ -218,10 +211,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);