* PCT(N) = true N% of the time (N integer from 0 to 100)
* TOTING(OBJ) = true if the OBJ is being carried */
-#define TOTING(OBJ) (PLACE[OBJ] == -1)
-#define AT(OBJ) (PLACE[OBJ] == LOC || FIXED[OBJ] == LOC)
+#define TOTING(OBJ) (game.place[OBJ] == -1)
+#define AT(OBJ) (game.place[OBJ] == LOC || game.fixed[OBJ] == LOC)
#define HERE(OBJ) (AT(OBJ) || TOTING(OBJ))
#define LIQ2(PBOTL) ((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL))
#define LIQ(DUMMY) (LIQ2(PROP[BOTTLE]<0 ? -1-PROP[BOTTLE] : PROP[BOTTLE]))
#define FOREST(LOC) ((LOC) >= 145 && (LOC) <= 166)
#define VOCWRD(LETTRS,SECT) (VOCAB(MAKEWD(LETTRS),SECT))
-/* The following two functions were added to fix a bug (CLOCK1 decremented
+/* The following two functions were added to fix a bug (game.clock1 decremented
* while in forest). They should probably be replaced by using another
* "cond" bit. For now, however, a quick fix... OUTSID(LOC) is true if
* LOC is outside, INDEEP(LOC) is true if LOC is "deep" in the cave (hall