\r
extern void init_normal_traps(void);\r
-extern s16b choose_random_trap(void);\r
+extern FEAT_IDX choose_random_trap(void);\r
extern void disclose_grid(POSITION y, POSITION x);\r
extern void place_trap(POSITION y, POSITION x);\r
extern void hit_trap(bool break_trap);\r
\r
+/* Types of normal traps */\r
+#define NOT_TRAP -1\r
+#define TRAP_TRAPDOOR 0\r
+#define TRAP_PIT 1\r
+#define TRAP_SPIKED_PIT 2\r
+#define TRAP_POISON_PIT 3\r
+#define TRAP_TY_CURSE 4\r
+#define TRAP_TELEPORT 5\r
+#define TRAP_FIRE 6\r
+#define TRAP_ACID 7\r
+#define TRAP_SLOW 8\r
+\r
+#define TRAP_LOSE_STR 9\r
+#define TRAP_LOSE_DEX 10\r
+#define TRAP_LOSE_CON 11\r
+#define TRAP_BLIND 12\r
+#define TRAP_CONFUSE 13\r
+#define TRAP_POISON 14\r
+#define TRAP_SLEEP 15\r
+#define TRAP_TRAPS 16\r
+#define TRAP_ALARM 17\r
+\r
#define MAX_NORMAL_TRAPS 18\r
\r
+\r
+/* Types of special traps */\r
+#define TRAP_OPEN 18\r
+#define TRAP_ARMAGEDDON 19\r
+#define TRAP_PIRANHA 20\r
+\r
+\r
+\r
/* See init_feat_variables() in init2.c */\r