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 b56015cabd5d5233c494bc9fc4a13fd82160a5fa..8abe1ff2318e080e5257c16076d773f3f7090fc5 100644 (file)
--- 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 ca22ef6e1662a2c7acd76fb2accae3b710fd36b2..08f999e3e6df1a51179d58384a4d774e92a85e2e 100644 (file)
--- 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);