-#include "newdb.h"
-
-struct game_t game;
-
-long LNLENG, LNPOSN, PARMS[MAXPARMS + 1];
-char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
-
-long AMBER, AXE, BACK, BATTERY, BEAR, BIRD, BLOOD,
- BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
- CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
- EMERALD, ENTER, ENTRNC, FIND, FISSURE, FOOD,
- GRATE, HINT, INVENT, JADE, KEYS,
- KNIFE, LAMP, LOCK, LOOK, MAGAZINE,
- MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,
- PEARL, PILLOW, PLANT, PLANT2, PYRAMID, RESER, ROD, ROD2,
- RUBY, RUG, SAPPH, SAY, SIGN, SNAKE,
- STEPS, STREAM, THROW, TRIDENT, TROLL, TROLL2,
- URN, VASE, VEND, VOLCANO, WATER;
-long WD1, WD1X, WD2, WD2X;
+#include "dungeon.h"
+
+#define DIM(a) (sizeof(a)/sizeof(a[0]))
+
+struct game_t game = {
+ .dloc[1] = LOC_KINGHALL,
+ .dloc[2] = LOC_WESTBANK,
+ .dloc[3] = LOC_Y2,
+ .dloc[4] = LOC_ALIKE3,
+ .dloc[5] = LOC_COMPLEX,
+
+ /* Sixth dwarf is special (the pirate). He always starts at his
+ * chest's eventual location inside the maze. This loc is saved
+ * in chloc for ref. The dead end in the other maze has its
+ * loc stored in chloc2. */
+ .dloc[6] = LOC_DEADEND12,
+ .chloc = LOC_DEADEND12,
+ .chloc2 = LOC_DEADEND13,
+ .abbnum = 5,
+ .clock1 = WARNTIME,
+ .clock2 = FLASHTIME,
+ .blklin = true
+};