X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.h;h=e3f8858523d179ca83ce1a3e0e634d32f4ba5587;hb=37a06df577bbfd00f4b361f92cacb0d97036ba93;hp=af5f39815e7b5d16e35b595561deb6934e9863cc;hpb=ba68c676a24c697907748c2653d77752363170fe;p=rocksndiamonds.git diff --git a/src/init.h b/src/init.h index af5f3981..e3f88585 100644 --- a/src/init.h +++ b/src/init.h @@ -16,8 +16,22 @@ #include "main.h" -void setMoveIntoAcidProperty(struct LevelInfo *, int, boolean); -boolean getMoveIntoAcidProperty(struct LevelInfo *, int); +#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)->dont_collide_with_bits, \ + EP_DONT_COLLIDE_WITH, e, v)) +#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); + void InitElementPropertiesStatic(void); void InitElementPropertiesEngine(int);