[Refactor] トラップの種別をenum化.

diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp
index da451b9..811911e 100644 (file)
--- a/src/grid/trap.cpp
+++ b/src/grid/trap.cpp
@@ -284,7 +284,7 @@ static int check_hit_from_monster_to_player(player_type *target_ptr, int power)
  * @brief 落とし穴系トラップの判定とプレイヤーの被害処理
  * @param trap_feat_type トラップの種別ID
  */
-static void hit_trap_pit(player_type *trapped_ptr, int trap_feat_type)
+static void hit_trap_pit(player_type *trapped_ptr, enum trap_type trap_feat_type)
 {
     HIT_POINT dam;
     concptr trap_name = "";
@@ -404,7 +404,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
     POSITION x = trapped_ptr->x, y = trapped_ptr->y;
     grid_type *g_ptr = &trapped_ptr->current_floor_ptr->grid_array[y][x];
     feature_type *f_ptr = &f_info[g_ptr->feat];
-    int trap_feat_type = has_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP;
+    enum trap_type trap_feat_type = has_flag(f_ptr->flags, FF_TRAP) ? (enum trap_type)f_ptr->subtype : NOT_TRAP;
     concptr name = _("トラップ", "a trap");
 
     disturb(trapped_ptr, FALSE, TRUE);
@@ -622,6 +622,9 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
         }
         break;
     }
+
+    default:
+        break;
     }
 
     if (break_trap && is_trap(trapped_ptr, g_ptr->feat)) {

diff --git a/src/grid/trap.h b/src/grid/trap.h
index 09bb885..a52cfcf 100644 (file)
--- a/src/grid/trap.h
+++ b/src/grid/trap.h
@@ -19,33 +19,35 @@
 #define CHEST_ALARM             0x0800 /*!< 箱のトラップ: 警報装置 */
 
 /* Types of normal traps */
-#define NOT_TRAP        -1
-#define TRAP_TRAPDOOR    0
-#define TRAP_PIT         1
-#define TRAP_SPIKED_PIT  2
-#define TRAP_POISON_PIT  3
-#define TRAP_TY_CURSE    4
-#define TRAP_TELEPORT    5
-#define TRAP_FIRE        6
-#define TRAP_ACID        7
-#define TRAP_SLOW        8
-
-#define TRAP_LOSE_STR    9
-#define TRAP_LOSE_DEX   10
-#define TRAP_LOSE_CON   11
-#define TRAP_BLIND      12
-#define TRAP_CONFUSE    13
-#define TRAP_POISON     14
-#define TRAP_SLEEP      15
-#define TRAP_TRAPS      16
-#define TRAP_ALARM      17
-
-#define MAX_NORMAL_TRAPS 18
-
-/* Types of special traps */
-#define TRAP_OPEN       18
-#define TRAP_ARMAGEDDON 19
-#define TRAP_PIRANHA    20
+enum trap_type {
+    NOT_TRAP = -1,
+    TRAP_TRAPDOOR = 0,
+    TRAP_PIT = 1,
+    TRAP_SPIKED_PIT = 2,
+    TRAP_POISON_PIT = 3,
+    TRAP_TY_CURSE = 4,
+    TRAP_TELEPORT = 5,
+    TRAP_FIRE = 6,
+    TRAP_ACID = 7,
+    TRAP_SLOW = 8,
+
+    TRAP_LOSE_STR = 9,
+    TRAP_LOSE_DEX = 10,
+    TRAP_LOSE_CON = 11,
+    TRAP_BLIND = 12,
+    TRAP_CONFUSE = 13,
+    TRAP_POISON = 14,
+    TRAP_SLEEP = 15,
+    TRAP_TRAPS = 16,
+    TRAP_ALARM = 17,
+
+    /* Types of special traps */
+    TRAP_OPEN = 18,
+    TRAP_ARMAGEDDON = 19,
+    TRAP_PIRANHA = 20,
+
+};
+const int MAX_NORMAL_TRAPS = TRAP_ALARM + 1;
 
 extern const int chest_traps[64];