X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.h;h=ca22ef6e1662a2c7acd76fb2accae3b710fd36b2;hb=a047db7b385f7523ca97deb21fdc504f34a80c7e;hp=7440123ff90e4f0bdecc9f52da76f1a5693dcf65;hpb=7993378f9ae3ba83d8d420be8a7f5c81859e1750;p=rocksndiamonds.git diff --git a/src/init.h b/src/init.h index 7440123f..ca22ef6e 100644 --- a/src/init.h +++ b/src/init.h @@ -16,9 +16,31 @@ #include "main.h" +#if 1 +#define setMoveIntoAcidProperty(l, e, v) \ + (setBitfieldProperty(&(l)->can_move_into_acid_bits, \ + EP_CAN_MOVE_INTO_ACID, e, v)) +#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, \ + EP_DONT_COLLIDE_WITH, e, v)) +#define getDontCollideWithProperty(l, e) \ + (getBitfieldProperty(&(l)->can_move_into_acid_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); -int get_special_property_bit(int, int); void ReloadCustomArtwork(int);