rnd-20060112-1-src

[rocksndiamonds.git] / src / init.h

diff --git a/src/init.h b/src/init.h
index ca22ef6e1662a2c7acd76fb2accae3b710fd36b2..e3f8858523d179ca83ce1a3e0e634d32f4ba5587 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -16,29 +16,22 @@
 
 #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);
 boolean getBitfieldProperty(int *, int, int);
 
-#else
-
-void setMoveIntoAcidProperty(struct LevelInfo *, int, boolean);
-boolean getMoveIntoAcidProperty(struct LevelInfo *, int);
-#endif
-
 void InitElementPropertiesStatic(void);
 void InitElementPropertiesEngine(int);