X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.h;h=75cf288d6be32540c1aba8807e38ccb7b7367f4c;hb=6d7ebf6db8a9a57f2e3e398da1d2f7d8d084523f;hp=ca22ef6e1662a2c7acd76fb2accae3b710fd36b2;hpb=5216f629803d5255919cadc2419fb1e798812ae2;p=rocksndiamonds.git diff --git a/src/init.h b/src/init.h index ca22ef6e..75cf288d 100644 --- a/src/init.h +++ b/src/init.h @@ -16,33 +16,27 @@ #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); void ReloadCustomArtwork(int); +void RedrawBackground(); void KeyboardAutoRepeatOffUnlessAutoplay();