-1
};
- static int ep_can_explode_dyna[] =
+ static int ep_can_explode_cross[] =
{
-1
};
{ ep_droppable, EP_DROPPABLE },
{ ep_can_explode_1x1, EP_CAN_EXPLODE_1X1 },
{ ep_pushable, EP_PUSHABLE },
- { ep_can_explode_dyna, EP_CAN_EXPLODE_DYNA },
+ { ep_can_explode_cross, EP_CAN_EXPLODE_CROSS },
{ ep_protected, EP_PROTECTED },
{ ep_player, EP_PLAYER },
/* ---------- CAN_EXPLODE_3X3 ------------------------------------------ */
SET_PROPERTY(i, EP_CAN_EXPLODE_3X3, (CAN_EXPLODE(i) &&
!CAN_EXPLODE_1X1(i) &&
- !CAN_EXPLODE_DYNA(i)));
+ !CAN_EXPLODE_CROSS(i)));
/* ---------- CAN_EXPLODE_BY_DRAGONFIRE -------------------------------- */
SET_PROPERTY(i, EP_CAN_EXPLODE_BY_DRAGONFIRE, CAN_EXPLODE_BY_FIRE(i));
i == EL_BLACK_ORB));
/* ---------- COULD_MOVE_INTO_ACID ------------------------------------- */
- SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (CAN_MOVE(i) ||
+ SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (ELEM_IS_PLAYER(i) ||
+ CAN_MOVE(i) ||
IS_CUSTOM_ELEMENT(i)));
/* ---------- MAYBE_DONT_COLLIDE_WITH ---------------------------------- */
printf("::: %d, %d, %d -> %d\n",
CAN_EXPLODE_1X1(i),
CAN_EXPLODE_3X3(i),
- CAN_EXPLODE_DYNA(i),
+ CAN_EXPLODE_CROSS(i),
CAN_EXPLODE(i));
#endif
element_info[element].access_direction = MV_ALL_DIRECTIONS;
- element_info[element].explosion_delay = 18;
+ element_info[element].explosion_delay = 17;
element_info[element].ignition_delay = 8;
}
}