X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=3cd2e23a369ff2ad69ec3f11bdf4d624a3f21c71;hb=da27ae1932d1311887ad3a677b10b87610e31854;hp=4c314651b977f374db1e91492a301fb6e10ce5eb;hpb=f9edfc51515853c21418c1d55b681a71681a748c;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 4c31465..3cd2e23 100644
--- a/advent.h
+++ b/advent.h
@@ -3,8 +3,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
-#include "common.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 #define LINESIZE	100
 #define NDWARVES	6		/* number of dwarves */
@@ -20,10 +19,37 @@
 #define FLASHTIME	50	/*turns from first warning till blinding flash */
 #define PANICTIME	15		/* time left after closing */
 #define BATTERYLIFE	2500		/* turn limit increment from batteries */
+#define WORD_NOT_FOUND  -1              /* "Word not found" flag value for the vocab hash functions. */
 
 typedef long token_t;	/* word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;	/* index into a vocabulary array */
 
+extern const char advent_to_ascii[128];
+extern const char ascii_to_advent[128];
+extern const char new_advent_to_ascii[64];
+extern const char new_ascii_to_advent[128];
+
+enum bugtype {
+   TOO_MANY_VOCABULARY_WORDS,                             // 4
+   REQUIRED_VOCABULARY_WORD_NOT_FOUND,                    // 5
+   INVALID_SECTION_NUMBER_IN_DATABASE,                    // 9
+   SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST = 20, // 20
+   RAN_OFF_END_OF_VOCABULARY_TABLE,                       // 21
+   VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3,       // 22
+   INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST,            // 23
+   TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST,              // 24
+   CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION,           // 25
+   LOCATION_HAS_NO_TRAVEL_ENTRIES,                        // 26
+   HINT_NUMBER_EXCEEDS_GOTO_LIST,                         // 27
+   TOO_MANY_PARAMETERS_GIVEN_TO_SETPRM,                   // 28
+   SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN=99, // 99
+   ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH,       // 100
+};
+
+/* Alas, declaring this static confuses the coverage analyzer */
+void bug(enum bugtype, const char *) __attribute__((__noreturn__));
+#define BUG(x) bug(x, #x)
+
 struct game_t {
     unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
     long abbnum;	/* How often to print non-abbreviated descriptions */
@@ -62,7 +88,7 @@ struct game_t {
     long trnluz;	/* # points lost so far due to number of turns used */
     long turns;		/* how many commands he's given (ignores yes/no) */
     bool wzdark;	/* whether the loc he's leaving was dark */
-    long zzword;
+    char zzword[6];
     bool blooded;	/* has player drunk of dragon's blood? */
     long abbrev[NLOCATIONS + 1];
     long atloc[NLOCATIONS + 1];
@@ -86,14 +112,16 @@ extern const char advent_to_ascii[];
 extern FILE *logfp;
 extern bool oldstyle, editline, prompt;
 
-enum speaktype {touch, look, hear, study};
+enum speaktype {touch, look, hear, study, change};
 
 /* b is not needed for POSIX but harmless */
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
+extern char* xstrdup(const char* s);
 extern void* xmalloc(size_t size);
 extern void packed_to_token(long, char token[]);
-extern void token_to_packed(char token[], long*);
+extern long token_to_packed(const char token[6]);
+extern void tokenize(char*, long tokens[4]);
 extern void vspeak(const char*, va_list);
 extern bool wordeq(token_t, token_t);
 extern bool wordempty(token_t);
@@ -103,11 +131,18 @@ extern void pspeak(vocab_t, enum speaktype, int, ...);
 extern void rspeak(vocab_t, ...);
 extern bool GETIN(FILE *, token_t*, token_t*, token_t*, token_t*);
 extern void echo_input(FILE*, char*, 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 long GETTXT(bool, bool, bool);
 extern token_t MAKEWD(long);
 extern long vocab(long, long);
+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 long get_vocab_id(const char*);
 extern void juggle(long);
 extern void move(long, long);
 extern long put(long, long, long);
@@ -117,6 +152,7 @@ extern long atdwrf(long);
 extern long setbit(long);
 extern bool tstbit(long, int);
 extern long rndvoc(long, long);
+extern void make_zzword(char*);
 extern bool MAPLIN(FILE *);
 extern void datime(long*, long*);
 
@@ -127,7 +163,7 @@ extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 extern long score(enum termination);
 extern void terminate(enum termination) __attribute__((noreturn));
-extern int savefile(FILE *);
+extern int savefile(FILE *, long);
 extern int suspend(void);
 extern int resume(void);
 extern int restore(FILE *);
@@ -160,19 +196,11 @@ extern int restore(FILE *);
 #define PCT(N)		(randrange(100) < (N))
 #define GSTONE(OBJ)	((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)	CNDBIT(LOC, COND_FOREST)
-#define VOCWRD(LETTRS,SECT)	(vocab(MAKEWD(LETTRS),SECT))
 #define SPECIAL(LOC)	((LOC) > SPECIALBASE)
 #define OUTSID(LOC)	(CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
 
 #define INDEEP(LOC)	((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
 
-/* vocabulary items */
-extern long FIND;
-extern long INVENT;
-extern long SAY;
-extern long LOCK;
-extern long THROW;
-
 enum speechpart {unknown, intransitive, transitive};
 
 struct command_t {
@@ -184,7 +212,7 @@ struct command_t {
 };
 
 void initialise(void);
-int action(FILE *input, struct command_t *command);
+int action(struct command_t *command);
 
 /* Phase codes for action returns.
  * These were at one time FORTRAN line numbers.