Use more C-like naming conventions for variables.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index ae9ecbae3fecfd641ca8453a18084c1b1690c5e6..ee8e3faa9808e33b831669291ddd986fcfb65147 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -11,7 +11,8 @@
 #define MAXTRS         79
 #define MAXPARMS       25
 #define INVLIMIT       7
-#define INTRANSITIVE   -1      /* illegal object number */
+#define INTRANSITIVE   -1              /* illegal object number */
+#define SPECIALBASE    300             /* base umber of special rooms */
 
 typedef struct lcg_state
 {
@@ -141,11 +142,12 @@ extern int saveresume(FILE *, bool);
 #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,0)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
+#define DARK(DUMMY)    ((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
 #define PCT(N) (randrange(100) < (N))
 #define GSTONE(OBJ)    ((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)    ((LOC) >= 145 && (LOC) <= 166)
 #define VOCWRD(LETTRS,SECT)    (VOCAB(MAKEWD(LETTRS),SECT))
+#define SPECIAL(LOC)   ((LOC) > SPECIALBASE)
 
 /*  The following two functions were added to fix a bug (game.clock1 decremented
  *  while in forest).  They should probably be replaced by using another
@@ -188,6 +190,25 @@ enum speechpart {unknown, intransitive, transitive};
 #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 bitss */
+#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 */
+
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if (r){}}while(0)