Narrow the scope of IGO.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 0f06ccc3d8cf5d836b00ab5b2c05d2cb9495581b..76b6080361e9c3db2ecb25d64a93fef04ba778d4 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 
 #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 */
 #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 knfloc;
     long limit;
     long lmwarn;

+    long loc;

     long newloc;
     long novice;
     long numdie;
     long newloc;
     long novice;
     long numdie;


@@ -51,17 +54,22 @@ struct game_t {
     long turns;
     long wzdark;
     long zzword;
     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 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 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;
 extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
 extern FILE *logfp;
 extern bool oldstyle;


@@ -126,16 +134,13 @@ extern void score(long);
 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,
 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,
+   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD, GRATE, HINT, I, INVENT,
+   J, JADE, K, KEYS, 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, SIGN, SNAKE, SPK, STEPS, STICK,
    STREAM, THROW, TK[], TRIDNT, TROLL, TROLL2,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
    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;
 
    VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;