X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=6f1c086d32957575b1cecc753bf794681474a7c8;hb=91ad0185ffcbda83f115433c630b40e4ea6f7a41;hp=3e5dc9a39e918f9dd653dd5aab4104157ec9b774;hpb=ab04fe4d413a36a91d26551f942f4881f54179be;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 3e5dc9a..6f1c086 100644
--- a/advent.h
+++ b/advent.h
@@ -10,12 +10,33 @@ typedef struct lcg_state
   unsigned long a, c, m, x;
 } lcg_state;
 
-typedef long token_t;	/* word token - someday this will be a character array */
+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 abbnum;
+    long blklin;
+    long bonus;
+    long chloc;
+    long chloc2;
+    long clock1;
+    long clock2;
+    long closed;
+    long closng;
+    long conds;
+    long detail;
+    long dflag;
+    long dkill;
+    long dtotal;
+    long foobar;
+    long holdng;
+    long iwest;
+    long knfloc;
+    long limit;
+    long lmwarn;
     long oldloc;
     long oldlc2;
+    long wzdark;
     long zzword;
     long dseen[NDWARVES+1];
     long dloc[NDWARVES+1];
@@ -24,7 +45,7 @@ struct game_t {
 
 extern struct game_t game;
 
-extern long ABB[], ATLOC[], BLKLIN, DFLAG, FIXED[], HOLDNG,
+extern long ABB[], ATLOC[], FIXED[],
 		LINK[], LNLENG, LNPOSN,
 		PARMS[], PLACE[];
 extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
@@ -88,17 +109,13 @@ extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 
 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,
-   COINS, CONDS, DALTLC, DETAIL,
-   DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS,
-   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
+extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
+   BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
+   CLAM, CLSHNT, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
+   EMRALD, ENTER, ENTRNC, FIND, FISSUR, 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,
+   I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
+   KNIFE, KQ, L, LAMP, LL, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
    NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
    OGRE, OIL, OLDOBJ, OYSTER,
@@ -108,6 +125,5 @@ extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    STREAM, TALLY, THRESH, THROW, TK[], TRIDNT,
    TRNDEX, TRNLUZ, TROLL, TROLL2,
    TURNS, URN, V1, V2, VASE, VEND, VERB,
-   VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X,
-   WZDARK;
+   VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;