X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=0f82f372df016d8333a9dc6e62d7cd284347aa4e;hb=bb78ca96ce24d30df54f3f8319d9d43129979c59;hp=074836c402d603ab8db095ae389e8bb9b78bb2e9;hpb=63f53c026d42fec1ae0421e47b9c68a5ae5e8731;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 074836c..0f82f37 100644
--- a/advent.h
+++ b/advent.h
@@ -2,13 +2,31 @@
 #include <stdbool.h>
 
 #define LINESIZE	100
+#define NDWARVES	6
+#define PIRATE		NDWARVES	/* must be NDWARVES-1 when zero-origin */
 
 typedef struct lcg_state
 {
   unsigned long a, c, m, x;
 } lcg_state;
 
-extern long ABB[], ATLOC[], BLKLIN, DFLAG, DLOC[], FIXED[], HOLDNG,
+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 {
+    long clock1;
+    long clock2;
+    long oldloc;
+    long oldlc2;
+    long zzword;
+    long dseen[NDWARVES+1];
+    long dloc[NDWARVES+1];
+    long odloc[NDWARVES+1];
+};
+
+extern struct game_t game;
+
+extern long ABB[], ATLOC[], BLKLIN, DFLAG, FIXED[], HOLDNG,
 		LINK[], LNLENG, LNPOSN,
 		PARMS[], PLACE[];
 extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
@@ -20,24 +38,23 @@ extern lcg_state lcgstate;
 #define READ_MODE "rb"
 #define WRITE_MODE "wb"
 
-extern void SPEAK(long);
-extern void PSPEAK(long,long);
-extern void RSPEAK(long);
+extern void SPEAK(vocab_t);
+extern void PSPEAK(vocab_t,int);
+extern void RSPEAK(vocab_t);
 extern void SETPRM(long,long,long);
 
-extern bool fGETIN(FILE *,long*,long*,long*,long*);
+extern bool fGETIN(FILE *,token_t*,token_t*,token_t*,token_t*);
 #define GETIN(input,WORD1,WORD1X,WORD2,WORD2X) fGETIN(input,&WORD1,&WORD1X,&WORD2,&WORD2X)
 
-extern long YES(FILE *,long,long,long);
-extern long GETNUM(FILE *);
-extern long GETTXT(long,long,long);
-extern long MAKEWD(long);
+extern long YES(FILE *,vocab_t,vocab_t,vocab_t);
+extern long GETTXT(bool,bool,bool);
+extern token_t MAKEWD(long);
 
-extern void fPUTTXT(long,long*,long);
+extern void fPUTTXT(token_t,long*,long);
 #define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
 
 extern void SHFTXT(long,long);
-extern void TYPE0();
+extern void TYPE0(void);
 
 extern void fSAVWDS(long*,long*,long*,long*,long*,long*,long*);
 #define SAVWDS(W1,W2,W3,W4,W5,W6,W7) fSAVWDS(&W1,&W2,&W3,&W4,&W5,&W6,&W7)
@@ -55,18 +72,17 @@ extern void CARRY(long,long);
 extern void DROP(long,long);
 extern long ATDWRF(long);
 extern long SETBIT(long);
-extern long TSTBIT(long,long);
+extern bool TSTBIT(long,int);
 extern long RNDVOC(long,long);
 extern void BUG(long);
 extern void MAPLIN(FILE *);
-extern void TYPE();
-extern void MPINIT();
+extern void TYPE(void);
+extern void MPINIT(void);
 
 extern void fSAVEIO(long,long,long*);
 #define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR)
 extern void DATIME(long*, long*);
 
-extern long IABS(long);
 extern long MOD(long,long);
 
 extern void set_seed(long);
@@ -77,17 +93,17 @@ extern void score(long);
 extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BONUS,
    BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
-   CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
+   CLAM, CLOSED, CLOSNG, CLSHNT,
    COINS, CONDS, DALTLC, DETAIL,
-   DKILL, DOOR, DPRSSN, DRAGON, DSEEN[], DTOTAL, DWARF, EGGS,
+   DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
    GRATE, HINT, HINTED[], HINTLC[],
    I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
    KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
-  LMWARN, LOC, LOCK, LOOK,
+   LMWARN, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
    NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
-   ODLOC[], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+   OGRE, OIL, OLDOBJ, OYSTER,
    PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
    SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STICK,
@@ -95,5 +111,5 @@ extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    TRNDEX, TRNLUZ, TROLL, TROLL2,
    TURNS, URN, V1, V2, VASE, VEND, VERB,
    VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X,
-   WZDARK, ZZWORD;
+   WZDARK;