X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=007217555f1e06e7b4a980d80b34c3ad99e49d0c;hb=8d90b03ee412e7b26c48fe8d89a3303d669aa142;hp=85d9026881e6cfc9d7d80f65dfd7b8885582f77a;hpb=dda636bbc1c15fc28e5d52ad08ef3bcc30a3e682;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 85d9026..0072175 100644
--- a/advent.h
+++ b/advent.h
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#include "sizes.h"
+
 #define LINESIZE	100
 #define NDWARVES	6
 #define PIRATE		NDWARVES	/* must be NDWARVES-1 when zero-origin */
@@ -35,6 +37,7 @@ struct game_t {
     long knfloc;
     long limit;
     long lmwarn;
+    long loc;
     long newloc;
     long novice;
     long numdie;
@@ -43,6 +46,7 @@ struct game_t {
     long oldobj;
     long panic;
     long saved;
+    long setup;
     long tally;
     long thresh;
     long trndex;
@@ -50,17 +54,22 @@ struct game_t {
     long turns;
     long wzdark;
     long zzword;
-    long abbrev[185+1];		/* FIXME: LOCSIZE in the compiler */
+    long abbrev[LOCSIZ+1];
+    long atloc[LOCSIZ+1];
     long dseen[NDWARVES+1];
     long dloc[NDWARVES+1];
     long odloc[NDWARVES+1];
+    long fixed[NOBJECTS+1];
+    long link[NOBJECTS*2 + 1];
+    long place[NOBJECTS+1];
+    long hinted[HNTSIZ+1];
+    long hintlc[HNTSIZ+1];
+    long prop[NOBJECTS+1];
 };
 
 extern struct game_t game;
 
-extern long ATLOC[], FIXED[],
-		LINK[], LNLENG, LNPOSN,
-		PARMS[], PLACE[];
+extern long LNLENG, LNPOSN, PARMS[];
 extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
 extern FILE *logfp;
 extern bool oldstyle;
@@ -126,15 +135,13 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
    CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
-   GRATE, HINT, HINTED[], HINTLC[],
-   I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
-   KNIFE, KQ, L, LAMP, LL, LOC, LOCK, LOOK,
-   MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OBJ,
-   OGRE, OIL, OLDOBJ, OYSTER,
-   PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
+   GRATE, HINT, I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
+   KNIFE, L, LAMP, LOCK, LOOK,
+   MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, NUGGET, NUL,
+   OGRE, OIL, OLDOBJ, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAM,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
-   SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STICK,
+   SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
    STREAM, THROW, TK[], TRIDNT, TROLL, TROLL2,
-   URN, V1, V2, VASE, VEND, VERB,
+   URN, V1, V2, VASE, VEND,
    VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;