X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=77cf39a00fdba9c92f5f0203782b86aaf47ba1ee;hb=0d7a16964bdac425962c0c0bcaa7488d9664c8d2;hp=111008428fb635d4a2908e9e151cdc2bb0c75650;hpb=85279bc51ad11bce89beae5b0e02f1faec520afa;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 11100842..77cf39a0 100644 --- a/src/init.c +++ b/src/init.c @@ -1273,10 +1273,18 @@ void InitElementPropertiesStatic() EL_SWITCHGATE_OPENING, EL_SWITCHGATE_CLOSED, EL_SWITCHGATE_CLOSING, +#if 0 + EL_SWITCHGATE_SWITCH_UP, + EL_SWITCHGATE_SWITCH_DOWN, +#endif EL_TIMEGATE_OPEN, EL_TIMEGATE_OPENING, EL_TIMEGATE_CLOSED, EL_TIMEGATE_CLOSING, +#if 0 + EL_TIMEGATE_SWITCH, + EL_TIMEGATE_SWITCH_ACTIVE, +#endif EL_TUBE_ANY, EL_TUBE_VERTICAL, EL_TUBE_HORIZONTAL, @@ -1383,7 +1391,7 @@ void InitElementPropertiesStatic() -1 }; - static int ep_can_smash_friends[] = + static int ep_can_smash_player[] = { EL_ROCK, EL_BD_ROCK, @@ -1416,7 +1424,7 @@ void InitElementPropertiesStatic() -1 }; - static int ep_can_smash_explosives[] = + static int ep_can_smash_everything[] = { EL_ROCK, EL_BD_ROCK, @@ -2310,9 +2318,9 @@ void InitElementPropertiesStatic() { ep_can_change, EP_CAN_CHANGE }, { ep_can_move, EP_CAN_MOVE }, { ep_can_fall, EP_CAN_FALL }, - { ep_can_smash_friends, EP_CAN_SMASH_FRIENDS }, + { ep_can_smash_player, EP_CAN_SMASH_PLAYER }, { ep_can_smash_enemies, EP_CAN_SMASH_ENEMIES }, - { ep_can_smash_explosives, EP_CAN_SMASH_EXPLOSIVES }, + { ep_can_smash_everything, EP_CAN_SMASH_EVERYTHING }, { ep_can_explode_by_fire, EP_CAN_EXPLODE_BY_FIRE }, { ep_can_explode_smashed, EP_CAN_EXPLODE_SMASHED }, { ep_can_explode_impact, EP_CAN_EXPLODE_IMPACT }, @@ -2450,9 +2458,9 @@ void InitElementPropertiesEngine(int engine_version) EP_DONT_COLLIDE_WITH, EP_CAN_MOVE, EP_CAN_FALL, - EP_CAN_SMASH_FRIENDS, + EP_CAN_SMASH_PLAYER, EP_CAN_SMASH_ENEMIES, - EP_CAN_SMASH_EXPLOSIVES, + EP_CAN_SMASH_EVERYTHING, EP_PUSHABLE, EP_CAN_BE_CRUMBLED, @@ -2562,17 +2570,17 @@ void InitElementPropertiesEngine(int engine_version) if (DONT_COLLIDE_WITH(i)) SET_PROPERTY(i, EP_DONT_RUN_INTO, TRUE); - /* ---------- CAN_SMASH_ENEMIES / CAN_SMASH_FRIENDS ------------------ */ - if (CAN_SMASH_EXPLOSIVES(i)) + /* ---------- CAN_SMASH_ENEMIES / CAN_SMASH_PLAYER ------------------- */ + if (CAN_SMASH_EVERYTHING(i)) SET_PROPERTY(i, EP_CAN_SMASH_ENEMIES, TRUE); if (CAN_SMASH_ENEMIES(i)) - SET_PROPERTY(i, EP_CAN_SMASH_FRIENDS, TRUE); + SET_PROPERTY(i, EP_CAN_SMASH_PLAYER, TRUE); } /* ---------- CAN_SMASH ------------------------------------------------ */ - SET_PROPERTY(i, EP_CAN_SMASH, (CAN_SMASH_FRIENDS(i) || + SET_PROPERTY(i, EP_CAN_SMASH, (CAN_SMASH_PLAYER(i) || CAN_SMASH_ENEMIES(i) || - CAN_SMASH_EXPLOSIVES(i))); + CAN_SMASH_EVERYTHING(i))); /* ---------- CAN_EXPLODE ---------------------------------------------- */ SET_PROPERTY(i, EP_CAN_EXPLODE, (CAN_EXPLODE_BY_FIRE(i) ||