X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=d34310663c8f148a4efb7882862249c91b04e789;hp=e831a0a9086e69d2f377d0f6017324ab89937967;hb=60ab7a63dc7c2b52bf21887f365a58588a08f708;hpb=e81bd6de8fa85f6f55306a66cb87070b0cf6fcc3

diff --git a/advent.h b/advent.h
index e831a0a..d343106 100644
--- a/advent.h
+++ b/advent.h
@@ -80,16 +80,16 @@ 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 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 char* xstrdup(const char*);
 extern void packed_to_token(long, char token[6]);
 extern void newspeak(char*);
-extern void SPEAK(vocab_t);
 extern void PSPEAK(vocab_t,int);
 extern void RSPEAK(vocab_t);
 extern void SETPRM(long,long,long);
@@ -115,7 +115,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);
@@ -123,8 +122,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
@@ -137,6 +136,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))
@@ -170,11 +170,28 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,
    STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
    URN, VASE, VEND, VOLCAN, WATER;
-/* everything else */
-extern long K, SPK, WD1, WD1X, WD2, WD2X;
 
 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
+
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if (r){}}while(0)