rnd-20030429-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 69f758a0ed50a1a4e86ad6a9c030fa566926971a..ff990234d956287476efc9b704d61d1aa91e992e 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -95,43 +95,45 @@
 #define EP_CAN_BE_CRUMBLED     27
 #define EP_CAN_MOVE            28
 #define EP_CAN_PASS_MAGIC_WALL 29
-#define EP_DONT_TOUCH          30
-#define EP_ENEMY               31
-#define EP_DONT_GO_TO          32
-#define EP_CAN_EXPLODE         33
-#define EP_BD_ELEMENT          34
-#define EP_SP_ELEMENT          35
-#define EP_SB_ELEMENT          36
-#define EP_GEM                 37
-#define EP_FOOD_DARK_YAMYAM    38
-#define EP_FOOD_PENGUIN                39
-#define EP_FOOD_PIG            40
-#define EP_HISTORIC_WALL       41
-#define EP_HISTORIC_SOLID      42
-#define EP_BELT                        43
-#define EP_BELT_ACTIVE         44
-#define EP_BELT_SWITCH         45
-#define EP_TUBE                        46
-#define EP_KEYGATE             47
-#define EP_AMOEBOID            48
-#define EP_AMOEBALIVE          49
-#define EP_HAS_CONTENT         50
-#define EP_ACTIVE_BOMB         51
-#define EP_INACTIVE            52
+#define EP_SWITCHABLE          30
+#define EP_DONT_TOUCH          31
+#define EP_ENEMY               32
+#define EP_DONT_GO_TO          33
+#define EP_CAN_EXPLODE         34
+#define EP_BD_ELEMENT          35
+#define EP_SP_ELEMENT          36
+#define EP_SB_ELEMENT          37
+#define EP_GEM                 38
+#define EP_FOOD_DARK_YAMYAM    39
+#define EP_FOOD_PENGUIN                40
+#define EP_FOOD_PIG            41
+#define EP_HISTORIC_WALL       42
+#define EP_HISTORIC_SOLID      43
+#define EP_BELT                        44
+#define EP_BELT_ACTIVE         45
+#define EP_BELT_SWITCH         46
+#define EP_TUBE                        47
+#define EP_KEYGATE             48
+#define EP_AMOEBOID            49
+#define EP_AMOEBALIVE          50
+#define EP_HAS_CONTENT         51
+#define EP_ACTIVE_BOMB         52
+#define EP_INACTIVE            53
 
 /* values for derived properties (determined from properties above) */
-#define EP_ACCESSIBLE_OVER     53
-#define EP_ACCESSIBLE_INSIDE   54
-#define EP_ACCESSIBLE_UNDER    55
-#define EP_WALKABLE            56
-#define EP_PASSABLE            57
-#define EP_ACCESSIBLE          58
-#define EP_WALL                        59
-#define EP_SOLID_FOR_PUSHING   60
-#define EP_DRAGONFIRE_PROOF    61
-#define EP_EXPLOSION_PROOF     62
-
-#define NUM_ELEMENT_PROPERTIES 63
+#define EP_ACCESSIBLE_OVER     54
+#define EP_ACCESSIBLE_INSIDE   55
+#define EP_ACCESSIBLE_UNDER    56
+#define EP_WALKABLE            57
+#define EP_PASSABLE            58
+#define EP_ACCESSIBLE          59
+#define EP_SNAPPABLE           60
+#define EP_WALL                        61
+#define EP_SOLID_FOR_PUSHING   62
+#define EP_DRAGONFIRE_PROOF    63
+#define EP_EXPLOSION_PROOF     64
+
+#define NUM_ELEMENT_PROPERTIES 65
 
 #define NUM_EP_BITFIELDS       ((NUM_ELEMENT_PROPERTIES + 31) / 32)
 #define EP_BITFIELD_BASE       0
@@ -168,6 +170,7 @@
 #define CAN_BE_CRUMBLED(e)     HAS_PROPERTY(e, EP_CAN_BE_CRUMBLED)
 #define CAN_MOVE(e)            HAS_PROPERTY(e, EP_CAN_MOVE)
 #define CAN_PASS_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL)
+#define IS_SWITCHABLE(e)       HAS_PROPERTY(e, EP_SWITCHABLE)
 #define DONT_TOUCH(e)          HAS_PROPERTY(e, EP_DONT_TOUCH)
 #define IS_ENEMY(e)            HAS_PROPERTY(e, EP_ENEMY)
 #define DONT_GO_TO(e)          HAS_PROPERTY(e, EP_DONT_GO_TO)
@@ -196,6 +199,7 @@
 #define IS_ACCESSIBLE_OVER(e)  HAS_PROPERTY(e, EP_ACCESSIBLE_OVER)
 #define IS_ACCESSIBLE_INSIDE(e)        HAS_PROPERTY(e, EP_ACCESSIBLE_INSIDE)
 #define IS_ACCESSIBLE_UNDER(e) HAS_PROPERTY(e, EP_ACCESSIBLE_UNDER)
+#define IS_SNAPPABLE(e)                HAS_PROPERTY(e, EP_SNAPPABLE)
 #define IS_WALKABLE(e)         HAS_PROPERTY(e, EP_WALKABLE)
 #define IS_PASSABLE(e)         HAS_PROPERTY(e, EP_PASSABLE)
 #define IS_ACCESSIBLE(e)       HAS_PROPERTY(e, EP_ACCESSIBLE)