X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=c13a9052a5c72373dd9706e526071562389f0b1e;hp=477b8b84652a0f51c15fe7d95098b9ca5fdccf8b;hb=f862f9f1d508e00bccc208e66b1d31a5e530ab3e;hpb=d61cab352ee4345311eb9dd1a40fe11fb979f463

diff --git a/advent.h b/advent.h
index 477b8b8..c13a905 100644
--- a/advent.h
+++ b/advent.h
@@ -6,22 +6,21 @@
 #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 */
+#define PANICTIME	15		/* time left after closing */
 
 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;
@@ -80,14 +79,13 @@ 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 char* xstrdup(const char*);
-extern void packed_to_token(long, char token[6]);
-extern void newspeak(char*);
+extern void packed_to_token(long, char token[]);
+extern void newspeak(const char*);
 extern void PSPEAK(vocab_t,int);
 extern void RSPEAK(vocab_t);
 extern void SETPRM(long,long,long);
@@ -97,7 +95,6 @@ extern long GETTXT(bool,bool,bool);
 extern token_t MAKEWD(long);
 extern void TYPE0(void);
 extern long VOCAB(long,long);
-extern void DSTROY(long);
 extern void JUGGLE(long);
 extern void MOVE(long,long);
 extern long PUT(long,long,long);
@@ -112,11 +109,15 @@ 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 int saveresume(FILE *, bool);
+extern void score(enum termination);
+extern int suspend(FILE *);
+extern int resume(FILE *);
+extern int restore(FILE *);
 
 /*
  *  MOD(N,M)	= Arithmetic modulus
@@ -132,8 +133,9 @@ 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 DESTROY(N)	MOVE(N, NOWHERE)
 #define MOD(N,M)	((N) % (M))
-#define TOTING(OBJ)	(game.place[OBJ] == -1)
+#define TOTING(OBJ)	(game.place[OBJ] == CARRIED)
 #define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
 #define HERE(OBJ)	(AT(OBJ) || TOTING(OBJ))
 #define LIQ2(PBOTL)	((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL))
@@ -142,10 +144,11 @@ extern int saveresume(FILE *, bool);
 #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 PCT(N)	(randrange(100) < (N))
+#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
@@ -153,8 +156,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,
@@ -169,6 +172,9 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
 
 enum speechpart {unknown, intransitive, transitive};
 
+void initialise(void);
+int action(FILE *input, enum speechpart part, long verb, token_t obj);
+
 /* 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.
@@ -207,6 +213,10 @@ enum speechpart {unknown, intransitive, transitive};
 #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 */
+#define NOWHERE	0	/* It's destroyed */
+
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if (r){}}while(0)