-#include "main.h"
-#include "database/database.h"
-#include "misc.h"
-
-long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
- DLOC[7], FIXED[101], HOLDNG,
- LINK[201], LNLENG, LNPOSN,
- PARMS[26], PLACE[101],
- SETUP = 0;
-signed char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
-
-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, DSEEN[7], DTOTAL, DWARF, EGGS,
- EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
- GRATE, HINT, HINTED[21], HINTLC[21],
- I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
- KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
- LMWARN, LOC, LOCK, LOOK,
- MAGZIN, MAXDIE, MAXTRS, MESH = 123456789,
- MESSAG, MIRROR, MXSCOR,
- NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
- ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
- PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], PYRAM,
- RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
+#include <time.h>
+#include "advent.h"
+#include "database.h"
+
+struct game_t game;
+
+long LNLENG, LNPOSN, PARMS[26];
+char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
+
+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, I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
+ KNIFE, L, LAMP, LOCK, LOOK,
+ MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR,
+ NUGGET, NUL, OGRE, OIL, OYSTER, PEARL, PILLOW,
+ PLANT, PLANT2, PYRAM, RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,