Improve namespace hygiene.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index b6992497a12a5219b2f8c7679d66301fb94e8f8c..b8fafeed0161bf0838b04f6e0cdfe422fcc6fc1f 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -128,6 +128,25 @@ extern int suspend(void);
 extern int resume(void);
 extern int restore(FILE *);
 
+/* Symbols for cond bits - used by following macros */
+#define COND_LIT       0       /* Light */
+#define COND_OILY      1       /* If bit 2 is on: on for oil, off for water */
+#define COND_FLUID     2       /* Liquid asset, see bit 1 */
+#define COND_NOARRR    3       /* Pirate doesn't go here unless following */
+#define COND_NOBACK    4       /* Cannot use "back" to move away */
+/* Bits past 10 indicate areas of interest to "hint" routines */
+#define COND_HBASE     10      /* Base for location hint bits */
+#define COND_HCAVE     11      /* Trying to get into cave */
+#define COND_HBIRD     12      /* Trying to catch bird */
+#define COND_HSNAKE    13      /* Trying to deal with snake */
+#define COND_HMAZE     14      /* Lost in maze */
+#define COND_HDARK     15      /* Pondering dark room */
+#define COND_HWITT     16      /* At Witt's End */
+#define COND_HCLIFF    17      /* Cliff with urn */
+#define COND_HWOODS    18      /* Lost in forest */
+#define COND_HOGRE     19      /* Trying to deal with ogre */
+#define COND_HJADE     20      /* Found all treasures except jade */
+
 /*
  *  MOD(N,M)   = Arithmetic modulus
  *  AT(OBJ)    = true if on either side of two-placed object
@@ -152,7 +171,7 @@ extern int restore(FILE *);
 #define LIQLOC(LOC)    (LIQ2((MOD(COND[LOC]/2*2,8)-5)*MOD(COND[LOC]/4,2)+1))
 #define CNDBIT(L,N)    (TSTBIT(COND[L],N))
 #define FORCED(LOC)    (COND[LOC] == 2)
-#define DARK(DUMMY)    ((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define DARK(DUMMY)    ((!CNDBIT(game.loc,COND_LIT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N)         (randrange(100) < (N))
 #define GSTONE(OBJ)    ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)    ((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
@@ -210,25 +229,6 @@ int action(FILE *input, struct command_t *command);
 #define GO_ACTION      40000
 #define GO_DWARFWAKE   19000
 
-/* Symbols for cond bits */
-#define LIGHT  0       /* Light */
-#define OILY   1       /* If bit 2 is on: on for oil, off for water */
-#define FLUID  2       /* Liquid asset, see bit 1 */
-#define NOARRR 3       /* Pirate doesn't go here unless following player */
-#define NOBACK 4       /* Cannot use "back" to move away */
-/* Bits past 10 indicate areas of interest to "hint" routines */
-#define HBASE  10      /* Base for location hint bits */
-#define HCAVE  11      /* Trying to get into cave */
-#define HBIRD  12      /* Trying to catch bird */
-#define HSNAKE 13      /* Trying to deal with snake */
-#define HMAZE  14      /* Lost in maze */
-#define HDARK  15      /* Pondering dark room */
-#define HWITT  16      /* At Witt's End */
-#define HCLIFF 17      /* Cliff with urn */
-#define HWOODS 18      /* Lost in forest */
-#define HOGRE  19      /* Trying to deal with ogre */
-#define HJADE  20      /* Found all treasures except jade */
-
 /* Special object statuses in game.place - can also be a location number (> 0) */
 #define CARRIED                -1      /* Player is toting it */