Cancellation explodes magical traps
This commit is contained in:
@@ -147,6 +147,7 @@ enum objclass_syms {
|
||||
|
||||
#define BURNING_OIL (MAXOCLASSES + 1) /* Can be used as input to explode. */
|
||||
#define MON_EXPLODE (MAXOCLASSES + 2) /* Exploding monster (e.g. gas spore) */
|
||||
#define TRAP_EXPLODE (MAXOCLASSES + 3)
|
||||
|
||||
#if 0 /* moved to decl.h so that makedefs.c won't see them */
|
||||
extern const struct class_sym
|
||||
|
||||
@@ -84,6 +84,13 @@ enum trap_types {
|
||||
|
||||
#define is_pit(ttyp) ((ttyp) == PIT || (ttyp) == SPIKED_PIT)
|
||||
#define is_hole(ttyp) ((ttyp) == HOLE || (ttyp) == TRAPDOOR)
|
||||
#define undestroyable_trap(ttyp) ((ttyp) == MAGIC_PORTAL \
|
||||
|| (ttyp) == VIBRATING_SQUARE)
|
||||
#define is_magical_trap(ttyp) ((ttyp) == TELEP_TRAP \
|
||||
|| (ttyp) == LEVEL_TELEP \
|
||||
|| (ttyp) == MAGIC_TRAP \
|
||||
|| (ttyp) == ANTI_MAGIC \
|
||||
|| (ttyp) == POLY_TRAP)
|
||||
/* "transportation" traps */
|
||||
#define is_xport(ttyp) ((ttyp) >= TELEP_TRAP && (ttyp) <= MAGIC_PORTAL)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user