Pack more globals into the game block structure.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 3dff47b05a3a08cfee33bd3e3ffd1cd65bd26f8d..1c22e149c501b7808b8c78306f823d89aaff2362 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -10,10 +10,27 @@ typedef struct lcg_state
   unsigned long a, c, m, x;
 } 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 {
 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 dkill;
+    long dtotal;
+    long oldloc;
+    long oldlc2;
+    long wzdark;
+    long zzword;

     long dseen[NDWARVES+1];
     long dloc[NDWARVES+1];
     long odloc[NDWARVES+1];
     long dseen[NDWARVES+1];
     long dloc[NDWARVES+1];
     long odloc[NDWARVES+1];


@@ -85,12 +102,9 @@ extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 
 extern void score(long);
 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,
+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, FOOBAR, FOOD,
    GRATE, HINT, HINTED[], HINTLC[],
    I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
    GRATE, HINT, HINTED[], HINTLC[],
    I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,


@@ -98,13 +112,12 @@ extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    LMWARN, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
    NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
    LMWARN, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
    NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,

-   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,
    STREAM, TALLY, THRESH, THROW, TK[], TRIDNT,
    TRNDEX, TRNLUZ, TROLL, TROLL2,
    TURNS, URN, V1, V2, VASE, VEND, VERB,
    PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
    SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STICK,
    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, ZZWORD;
+   VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;