X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=93681a630d71084e7ffd9fb3864e12817de208ac;hb=1896e0f88660f0f589a065c7ce2f9d98c1f161b8;hp=48aab1d0517b505e7f57f8b05f224f89a7b777b2;hpb=7485a8a1e1b8fefbc1125afbe855d8a1377d1fb4;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 48aab1d..93681a6 100644
--- a/advent.h
+++ b/advent.h
@@ -11,17 +11,14 @@
 #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 umber of special rooms */
 
 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 +49,6 @@ struct game_t {
     long oldobj;
     long panic;
     long saved;
-    long setup;
     long tally;
     long thresh;
     long trndex;
@@ -80,14 +76,13 @@ extern char rawbuf[LINESIZE], INLINE[LINESIZE+1];
 extern const char ascii_to_advent[];
 extern const char advent_to_ascii[];
 extern FILE *logfp;
-extern bool oldstyle;
-extern lcg_state lcgstate;
+extern bool oldstyle, editline, prompt;
 
 /* 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 +91,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);
@@ -114,7 +107,6 @@ extern void BUG(long) __attribute__((noreturn));
 extern bool MAPLIN(FILE *);
 extern void TYPE(void);
 extern void DATIME(long*, long*);
-extern long MOD(long,long);
 
 extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
@@ -122,8 +114,8 @@ extern long randrange(long);
 extern void score(long);
 extern int saveresume(FILE *, bool);
 
-/*  Statement functions
- *
+/*
+ *  MOD(N,M)	= Arithmetic modulus
  *  AT(OBJ)	= true if on either side of two-placed object
  *  CNDBIT(L,N) = true if COND(L) has bit n set (bit 0 is units bit)
  *  DARK(LOC)   = true if location "LOC" is dark
@@ -136,6 +128,7 @@ extern int saveresume(FILE *, bool);
  *  PCT(N)      = true N% of the time (N integer from 0 to 100)
  *  TOTING(OBJ) = true if the OBJ is being carried */
 
+#define MOD(N,M)	((N) % (M))
 #define TOTING(OBJ)	(game.place[OBJ] == -1)
 #define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
 #define HERE(OBJ)	(AT(OBJ) || TOTING(OBJ))
@@ -144,11 +137,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 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
@@ -172,6 +166,44 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
 
 enum speechpart {unknown, intransitive, transitive};
 
+/* 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.
+ */
+#define GO_TERMINATE	2
+#define GO_MOVE		8
+#define GO_TOP		2000
+#define GO_CLEAROBJ	2012
+#define GO_CHECKHINT	2600
+#define GO_CHECKFOO	2607
+#define GO_CLOSEJUMP	2610
+#define GO_DIRECTION	2620
+#define GO_LOOKUP	2630
+#define GO_WORD2	2800
+#define GO_SPECIALS	1900
+#define GO_UNKNOWN	8000
+#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)