X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=1f2bd8c893d18c1ef40a0009992b67c1746bef6b;hb=d4fc7a88b4aac2f72013e7c681c907de09db349d;hp=f831a7b487d8a472bf00ca6748790e05374961e4;hpb=a044f10411cac5c530a19a66b7252110d5d1ca0f;p=open-adventure.git

diff --git a/advent.h b/advent.h
index f831a7b..1f2bd8c 100644
--- a/advent.h
+++ b/advent.h
@@ -6,22 +6,20 @@
 #define LINESIZE	100
 #define NDWARVES	6
 #define PIRATE		NDWARVES	/* must be NDWARVES-1 when zero-origin */
-#define DALTLC		18		/* alternate dwarf location; low room */
+#define DALTLC		LOC_NUGGET	/* alternate dwarf location */
 #define MINTRS		50
 #define MAXTRS		79
 #define MAXPARMS	25
 #define INVLIMIT	7
-#define INTRANSITIVE	-1	/* illegal object number */
-
-typedef struct lcg_state
-{
-  unsigned long a, c, m, x;
-} lcg_state;
+#define INTRANSITIVE	-1		/* illegal object number */
+#define SPECIALBASE	300		/* base number of special rooms */
+#define WARNTIME	30		/* late game starts at game.limit-this */
 
 typedef long token_t;	/* word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;	/* index into a vocabulary array */
 
 struct game_t {
+    unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
     long abbnum;
     long blklin;
     long bonus;
@@ -52,7 +50,6 @@ struct game_t {
     long oldobj;
     long panic;
     long saved;
-    long setup;
     long tally;
     long thresh;
     long trndex;
@@ -81,13 +78,12 @@ extern const char ascii_to_advent[];
 extern const char advent_to_ascii[];
 extern FILE *logfp;
 extern bool oldstyle, editline, prompt;
-extern lcg_state lcgstate;
 
 /* b is not needed for POSIX but harmless */
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
-extern void* xmalloc(size_t);
-extern void packed_to_token(long, char token[6]);
+extern char* xstrdup(const char*);
+extern void packed_to_token(long, char token[]);
 extern void newspeak(char*);
 extern void PSPEAK(vocab_t,int);
 extern void RSPEAK(vocab_t);
@@ -96,8 +92,6 @@ extern bool GETIN(FILE *,token_t*,token_t*,token_t*,token_t*);
 extern long YES(FILE *,vocab_t,vocab_t,vocab_t);
 extern long GETTXT(bool,bool,bool);
 extern token_t MAKEWD(long);
-extern void PUTTXT(token_t,long*,long);
-extern void SHFTXT(long,long);
 extern void TYPE0(void);
 extern long VOCAB(long,long);
 extern void DSTROY(long);
@@ -115,10 +109,12 @@ extern bool MAPLIN(FILE *);
 extern void TYPE(void);
 extern void DATIME(long*, long*);
 
+enum termination {endgame, quitgame, scoregame};
+
 extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
-extern void score(long);
+extern void score(enum termination);
 extern int saveresume(FILE *, bool);
 
 /*
@@ -144,11 +140,12 @@ extern int saveresume(FILE *, bool);
 #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,0)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define DARK(DUMMY)	((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N)	(randrange(100) < (N))
 #define GSTONE(OBJ)	((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
-#define FOREST(LOC)	((LOC) >= 145 && (LOC) <= 166)
+#define FOREST(LOC)	((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
 #define VOCWRD(LETTRS,SECT)	(VOCAB(MAKEWD(LETTRS),SECT))
+#define SPECIAL(LOC)	((LOC) > SPECIALBASE)
 
 /*  The following two functions were added to fix a bug (game.clock1 decremented
  *  while in forest).  They should probably be replaced by using another
@@ -156,8 +153,8 @@ extern int saveresume(FILE *, bool);
  *  LOC is outside, INDEEP(LOC) is true if LOC is "deep" in the cave (hall
  *  of mists or deeper).  Note special kludges for "Foof!" locs. */
 
-#define OUTSID(LOC)	((LOC) <= 8 || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == 180 || (LOC) == 182)
-#define INDEEP(LOC)	((LOC) >= 15 && !OUTSID(LOC) && (LOC) != 179)
+#define OUTSID(LOC)	((LOC) <= LOC_GRATE || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == LOC_FOOF2 || (LOC) == LOC_FOOF4)
+#define INDEEP(LOC)	((LOC) >= LOC_MISTHALL && !OUTSID(LOC) && (LOC) != LOC_FOOF1)
 
 /* vocabulary items */ 
 extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
@@ -191,6 +188,25 @@ enum speechpart {unknown, intransitive, transitive};
 #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 bitss */
+#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 */
+
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if (r){}}while(0)