X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=advent.h;h=ed39d8e84a2af66257b48638e2adf84d3208b125;hb=0b02763bf07618d3b3b88d9a8c907d0d60b33014;hp=0f06ccc3d8cf5d836b00ab5b2c05d2cb9495581b;hpb=7f4cff11889363b959a9987e92c9f62244397574;p=open-adventure.git diff --git a/advent.h b/advent.h index 0f06ccc..ed39d8e 100644 --- a/advent.h +++ b/advent.h @@ -1,6 +1,8 @@ #include #include +#include "sizes.h" + #define LINESIZE 100 #define NDWARVES 6 #define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */ @@ -51,17 +53,20 @@ 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]; }; 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; @@ -127,7 +132,7 @@ 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[], + GRATE, HINT, 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,