X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=94fbd88877ca162c310e0cd9f37e5a405460c9bf;hb=51494657fd3689a4202e3ed6db41f5bcded9e2c6;hp=f199489e7034939236b463fcddf7157c2d34c83a;hpb=87961483a22111329eac6967705190ccd72330f6;p=open-adventure.git

diff --git a/advent.h b/advent.h
index f199489..94fbd88 100644
--- a/advent.h
+++ b/advent.h
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 
 #include "common.h"
+#include "newdb.h"
 
 #define LINESIZE	100
 #define NDWARVES	6		/* number of dwarves */
@@ -70,14 +71,14 @@ struct game_t {
     long fixed[NOBJECTS + 1];
     long link[NOBJECTS * 2 + 1];
     long place[NOBJECTS + 1];
-    long hinted[HNTSIZ + 1];
-    long hintlc[HNTSIZ + 1];
+    long hinted[HINT_COUNT];
+    long hintlc[HINT_COUNT];
     long prop[NOBJECTS + 1];
 };
 
 extern struct game_t game;
 
-extern long LNLENG, LNPOSN, PARMS[];
+extern long LNLENG, LNPOSN;
 extern char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
 extern const char ascii_to_advent[];
 extern const char advent_to_ascii[];
@@ -88,12 +89,15 @@ extern bool oldstyle, editline, prompt;
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
 extern void* xmalloc(size_t size);
-extern char* xstrdup(const char*);
 extern void packed_to_token(long, char token[]);
-extern void speak(const char*);
-extern void PSPEAK(vocab_t, int);
-extern void RSPEAK(vocab_t);
-extern void SETPRM(long, long, long);
+extern void token_to_packed(char token[], long*);
+extern void vspeak(const char*, 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 pspeak(vocab_t, 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 char* get_input(void);
@@ -145,10 +149,10 @@ extern int restore(FILE *);
 #define HERE(OBJ)	(AT(OBJ) || TOTING(OBJ))
 #define LIQ2(PBOTL)	((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL))
 #define LIQUID()	(LIQ2(game.prop[BOTTLE]<0 ? -1-game.prop[BOTTLE] : game.prop[BOTTLE]))
-#define LIQLOC(LOC)	(LIQ2((MOD(COND[LOC]/2*2,8)-5)*MOD(COND[LOC]/4,2)+1))
-#define CNDBIT(L,N)	(TSTBIT(COND[L],N))
-#define FORCED(LOC)	(COND[LOC] == 2)
-#define DARK(DUMMY)	((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define LIQLOC(LOC)	(LIQ2((MOD(conditions[LOC]/2*2,8)-5)*MOD(conditions[LOC]/4,2)+1))
+#define CNDBIT(L,N)	(TSTBIT(conditions[L],N))
+#define FORCED(LOC)	CNDBIT(LOC, COND_FORCED)
+#define DARK(DUMMY)	((!TSTBIT(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N)		(randrange(100) < (N))
 #define GSTONE(OBJ)	((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)	((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
@@ -177,8 +181,16 @@ extern long AMBER, ATTACK, AXE, BACK, BATTERY, BEAR,
 
 enum speechpart {unknown, intransitive, transitive};
 
+struct command_t {
+    enum speechpart part;
+    vocab_t verb;
+    vocab_t obj;
+    token_t wd1, wd1x;
+    token_t wd2, wd2x;
+};
+
 void initialise(void);
-int action(FILE *input, enum speechpart part, token_t verb, token_t obj);
+int action(FILE *input, struct command_t *command);
 
 /* Phase codes for action returns.
  * These were at one time FORTRAN line numbers.
@@ -198,25 +210,6 @@ int action(FILE *input, enum speechpart part, token_t verb, token_t obj);
 #define GO_ACTION	40000
 #define GO_DWARFWAKE	19000
 
-/* Symbols for cond bits */
-#define LIGHT	0	/* Light */
-#define OILY	1	/* If bit 2 is on: on for oil, off for water */
-#define FLUID	2	/* Liquid asset, see bit 1 */
-#define NOARRR	3	/* Pirate doesn't go here unless following player */
-#define NOBACK	4	/* Cannot use "back" to move away */
-/* Bits past 10 indicate areas of interest to "hint" routines */
-#define HBASE	10	/* Base for location hint bits */
-#define HCAVE	11	/* Trying to get into cave */
-#define HBIRD	12	/* Trying to catch bird */
-#define HSNAKE	13	/* Trying to deal with snake */
-#define HMAZE	14	/* Lost in maze */
-#define HDARK	15	/* Pondering dark room */
-#define HWITT	16	/* At Witt's End */
-#define HCLIFF	17	/* Cliff with urn */
-#define HWOODS	18	/* Lost in forest */
-#define HOGRE	19	/* Trying to deal with ogre */
-#define HJADE	20	/* Found all treasures except jade */
-
 /* Special object statuses in game.place - can also be a location number (> 0) */
 #define CARRIED		-1	/* Player is toting it */