X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=fbd89b278cf005a760fdea16059174e6c420e030;hb=478ead0811dfe963fe610b4fdf2b74a16c7bd12b;hp=71f525facd0af881ce90e911262a170d0f443735;hpb=3f336329750dff46fe1634f317eee24515cd9d11;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 71f525fa..fbd89b27 100644
--- a/src/main.h
+++ b/src/main.h
@@ -108,6 +108,7 @@
 #define EP_THROWABLE			28
 #define EP_CAN_EXPLODE			29
 #define EP_GRAVITY_REACHABLE		30
+#define EP_DONT_GET_HIT_BY		31
 
 /* values for pre-defined properties */
 /* (from here on, values can be changed by inserting new values) */
@@ -548,6 +549,7 @@
 #define IS_THROWABLE(e)		HAS_PROPERTY(e, EP_THROWABLE)
 #define CAN_EXPLODE(e)		HAS_PROPERTY(e, EP_CAN_EXPLODE)
 #define IS_GRAVITY_REACHABLE(e)	HAS_PROPERTY(e, EP_GRAVITY_REACHABLE)
+#define DONT_GET_HIT_BY(e)	HAS_PROPERTY(e, EP_DONT_GET_HIT_BY)
 
 /* macros for special configurable properties */
 #define IS_EM_SLIPPERY_WALL(e)	HAS_PROPERTY(e, EP_EM_SLIPPERY_WALL)
@@ -674,9 +676,11 @@
 	 			 (e) <= EL_EM_GATE_4)
 #define IS_EMC_GATE(e)		((e) >= EL_EMC_GATE_5 &&		\
 	 			 (e) <= EL_EMC_GATE_8)
+#define IS_DC_GATE(e)		((e) == EL_DC_GATE_WHITE)
 #define IS_GATE(e)		(IS_RND_GATE(e) ||			\
 				 IS_EM_GATE(e) ||			\
-				 IS_EMC_GATE(e))
+				 IS_EMC_GATE(e) ||			\
+				 IS_DC_GATE(e))
 #define RND_GATE_NR(e)		((e) - EL_GATE_1)
 #define EM_GATE_NR(e)		((e) - EL_EM_GATE_1)
 #define EMC_GATE_NR(e)		((e) - EL_EMC_GATE_5 + 4)
@@ -696,12 +700,17 @@
 	 			 (e) <= EL_EMC_GATE_8_GRAY)
 #define IS_EMC_GATE_GRAY_ACTIVE(e) ((e) >= EL_EMC_GATE_5_GRAY_ACTIVE &&	\
 	 			 (e) <= EL_EMC_GATE_8_GRAY_ACTIVE)
+#define IS_DC_GATE_GRAY(e)	((e) == EL_DC_GATE_WHITE_GRAY)
+#define IS_DC_GATE_GRAY_ACTIVE(e) ((e) == EL_DC_GATE_WHITE_GRAY_ACTIVE)
+
 #define IS_GATE_GRAY(e)		(IS_RND_GATE_GRAY(e) ||			\
 				 IS_EM_GATE_GRAY(e) ||			\
-				 IS_EMC_GATE_GRAY(e))
+				 IS_EMC_GATE_GRAY(e) ||			\
+				 IS_DC_GATE_GRAY(e))
 #define IS_GATE_GRAY_ACTIVE(e)	(IS_RND_GATE_GRAY_ACTIVE(e) ||		\
 				 IS_EM_GATE_GRAY_ACTIVE(e) ||		\
-				 IS_EMC_GATE_GRAY_ACTIVE(e))
+				 IS_EMC_GATE_GRAY_ACTIVE(e) ||		\
+				 IS_DC_GATE_GRAY_ACTIVE(e))
 #define RND_GATE_GRAY_NR(e)	((e) - EL_GATE_1_GRAY)
 #define RND_GATE_GRAY_ACTIVE_NR(e) ((e) - EL_GATE_1_GRAY_ACTIVE)
 #define EM_GATE_GRAY_NR(e)	((e) - EL_EM_GATE_1_GRAY)