From: Holger Schemel <info@artsoft.org>
Date: Sun, 8 Aug 2004 08:22:36 +0000 (+0200)
Subject: rnd-20040808-1-src
X-Git-Tag: 3.1.1^2~84
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=27761d23147efd8150fd8ca9601fa30f623ce573

rnd-20040808-1-src
* improved level change detection in editor (settings now also checked)
* fixed bug with "can move into acid" and "don't collide with" state
---

diff --git a/ChangeLog b/ChangeLog
index b56015ca..8abe1ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 	* fixed bug in gadget code which caused reset of CEs in level editor
 	  (example: pressing 'b' [grab brush] on CE config page erased values)
 	  (solution: check if gadgets in ClickOnGadget() are really mapped)
+	* improved level change detection in editor (settings now also checked)
+	* fixed bug with "can move into acid" and "don't collide with" state
 
 2004-07-29
 	* fixed maze runner style CEs to use the configured move delay value
diff --git a/src/init.h b/src/init.h
index ca22ef6e..08f999e3 100644
--- a/src/init.h
+++ b/src/init.h
@@ -17,17 +17,17 @@
 #include "main.h"
 
 #if 1
-#define setMoveIntoAcidProperty(l, e, v)	\
+#define setMoveIntoAcidProperty(l, e, v)			\
 	(setBitfieldProperty(&(l)->can_move_into_acid_bits,	\
 			     EP_CAN_MOVE_INTO_ACID, e, v))
-#define getMoveIntoAcidProperty(l, e)		\
+#define getMoveIntoAcidProperty(l, e)				\
 	(getBitfieldProperty(&(l)->can_move_into_acid_bits,	\
 			     EP_CAN_MOVE_INTO_ACID, e))
-#define setDontCollideWithProperty(l, e, v)	\
-	(setBitfieldProperty(&(l)->can_move_into_acid_bits,	\
+#define setDontCollideWithProperty(l, e, v)			\
+	(setBitfieldProperty(&(l)->dont_collide_with_bits,	\
 			     EP_DONT_COLLIDE_WITH, e, v))
-#define getDontCollideWithProperty(l, e)	\
-	(getBitfieldProperty(&(l)->can_move_into_acid_bits,	\
+#define getDontCollideWithProperty(l, e)			\
+	(getBitfieldProperty(&(l)->dont_collide_with_bits,	\
 			     EP_DONT_COLLIDE_WITH, e))
 
 void setBitfieldProperty(int *, int, int, boolean);