From: Holger Schemel <info@artsoft.org>
Date: Fri, 25 Jan 2008 22:22:46 +0000 (+0100)
Subject: rnd-20080125-2-src
X-Git-Tag: 3.2.6.0^2~19
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=478ead0811dfe963fe610b4fdf2b74a16c7bd12b;p=rocksndiamonds.git

rnd-20080125-2-src
* fixed bug with "gray" white door not being uncovered by magnifier
---

diff --git a/ChangeLog b/ChangeLog
index 9940b396..d7ce7499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-01-25
+	* fixed bug with "gray" white door not being uncovered by magnifier
+
 2008-01-22
 	* added condition "deadly when <getting hit by>" for custom elements
 	  that behaves a bit like the existing "deadly when <colliding with>",
diff --git a/src/conftime.h b/src/conftime.h
index 0513971f..711585f0 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2008-01-25 22:26"
+#define COMPILE_DATE_STRING "2008-01-25 23:14"
diff --git a/src/game.c b/src/game.c
index 72314369..9097cb1f 100644
--- a/src/game.c
+++ b/src/game.c
@@ -6436,6 +6436,8 @@ static void RedrawAllInvisibleElementsForMagnifier()
 		    element - EL_EM_GATE_1_GRAY + EL_EM_GATE_1_GRAY_ACTIVE :
 		    IS_EMC_GATE_GRAY(element) ?
 		    element - EL_EMC_GATE_5_GRAY + EL_EMC_GATE_5_GRAY_ACTIVE :
+		    IS_DC_GATE_GRAY(element) ?
+		    EL_DC_GATE_WHITE_GRAY_ACTIVE :
 		    element);
       TEST_DrawLevelField(x, y);
     }
@@ -6448,6 +6450,8 @@ static void RedrawAllInvisibleElementsForMagnifier()
 		    element - EL_EM_GATE_1_GRAY_ACTIVE + EL_EM_GATE_1_GRAY :
 		    IS_EMC_GATE_GRAY_ACTIVE(element) ?
 		    element - EL_EMC_GATE_5_GRAY_ACTIVE + EL_EMC_GATE_5_GRAY :
+		    IS_DC_GATE_GRAY_ACTIVE(element) ?
+		    EL_DC_GATE_WHITE_GRAY :
 		    element);
       TEST_DrawLevelField(x, y);
     }
diff --git a/src/main.h b/src/main.h
index 3f88801c..fbd89b27 100644
--- a/src/main.h
+++ b/src/main.h
@@ -676,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)
@@ -698,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)