-#define LINESIZE 100
-#define NDWARVES 6 /* number of dwarves */
-#define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */
-#define DALTLC LOC_NUGGET /* alternate dwarf location */
-#define MAXPARMS 25 /* Max parameters for speak() */
-#define INVLIMIT 7 /* inverntory limit (# of objects) */
-#define INTRANSITIVE -1 /* illegal object number */
-#define SPECIALBASE 300 /* base number of special rooms */
-#define GAMELIMIT 330 /* base limit of turns */
-#define NOVICELIMIT 1000 /* limit of turns for novice */
-#define WARNTIME 30 /* late game starts at game.limit-this */
-#define FLASHTIME 50 /*turns from first warning till blinding flash */
-#define PANICTIME 15 /* time left after closing */
-#define BATTERYLIFE 2500 /* turn limit increment from batteries */
-#define WORD_NOT_FOUND -1 /* "Word not found" flag value for the vocab hash functions. */
+/*
+ * MOD(N,M) = Arithmetic modulus
+ * AT(OBJ) = true if on either side of two-placed object
+ * CNDBIT(L,N) = true if COND(L) has bit n set (bit 0 is units bit)
+ * DARK(LOC) = true if location "LOC" is dark
+ * FORCED(LOC) = true if LOC moves without asking for input (COND=2)
+ * FOREST(LOC) = true if LOC is part of the forest
+ * GSTONE(OBJ) = true if OBJ is a gemstone
+ * HERE(OBJ) = true if the OBJ is at "LOC" (or is being carried)
+ * LIQUID() = object number of liquid in bottle
+ * LIQLOC(LOC) = object number of liquid (if any) at LOC
+ * PCT(N) = true N% of the time (N integer from 0 to 100)
+ * TOTING(OBJ) = true if the OBJ is being carried */
+#define DESTROY(N) move(N, LOC_NOWHERE)
+#define MOD(N,M) ((N) % (M))
+#define TOTING(OBJ) (game.place[OBJ] == CARRIED)
+#define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
+#define HERE(OBJ) (AT(OBJ) || TOTING(OBJ))
+#define CNDBIT(L,N) (tstbit(conditions[L],N))
+#define LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == OIL_BOTTLE ? OIL : NO_OBJECT )
+#define LIQLOC(LOC) (CNDBIT((LOC),COND_FLUID)? CNDBIT((LOC),COND_OILY) ? OIL : WATER : NO_OBJECT)
+#define FORCED(LOC) CNDBIT(LOC, COND_FORCED)
+#define DARK(DUMMY) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
+#define PCT(N) (randrange(100) < (N))
+#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
+#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
+#define SPECIAL(LOC) ((LOC) > SPECIALBASE)
+#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
+#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
+#define BUG(x) bug(x, #x)
+#define MOTION_WORD(n) ((n) + 0)
+#define OBJECT_WORD(n) ((n) + 1000)
+#define ACTION_WORD(n) ((n) + 2000)
+#define SPECIAL_WORD(n) ((n) + 3000)
+#define PROMOTE_WORD(n) ((n) + 1000)
+#define DEMOTE_WORD(n) ((n) - 1000)