Magic-number and state-arithmetic removal.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 6f66d1ec4414c3be019c606690fe26911f73bf88..cf049f48c9e9ede5f3920317b43a8eaac3e86071 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -54,6 +54,12 @@
 #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)
 
 enum bugtype {
     SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,