[Refactor] mind_mirror_master_type を enum class 化

diff --git a/src/mind/mind-mirror-master.cpp b/src/mind/mind-mirror-master.cpp
index 7da5e28..2fdde64 100644 (file)
--- a/src/mind/mind-mirror-master.cpp
+++ b/src/mind/mind-mirror-master.cpp
@@ -313,7 +313,7 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
     POSITION x, y;
     auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x];
     switch (spell) {
-    case MIRROR_SEEING:
+    case mind_mirror_master_type::MIRROR_SEEING:
         tmp = g_ptr->is_mirror() ? 4 : 0;
         if (plev + tmp > 4) {
             detect_monsters_normal(player_ptr, DETECT_RAD_DEFAULT);
@@ -331,7 +331,7 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
             msg_print(_("鏡がなくて集中できなかった！", "You need a mirror to concentrate!"));
         }
         break;
-    case MAKE_MIRROR:
+    case mind_mirror_master_type::MAKE_MIRROR:
         if (number_of_mirrors(player_ptr->current_floor_ptr) < 4 + plev / 10) {
             SpellsMirrorMaster(player_ptr).place_mirror();
         } else {
@@ -339,7 +339,7 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
         }
 
         break;
-    case DRIP_LIGHT:
+    case mind_mirror_master_type::DRIP_LIGHT:
         if (!get_aim_dir(player_ptr, &dir)) {
             return false;
         }
@@ -351,33 +351,33 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
         }
 
         break;
-    case WRAPPED_MIRROR:
+    case mind_mirror_master_type::WRAPPED_MIRROR:
         teleport_player(player_ptr, 10, TELEPORT_SPONTANEOUS);
         break;
-    case MIRROR_LIGHT:
+    case mind_mirror_master_type::MIRROR_LIGHT:
         (void)lite_area(player_ptr, damroll(2, (plev / 2)), (plev / 10) + 1);
         break;
-    case WANDERING_MIRROR:
+    case mind_mirror_master_type::WANDERING_MIRROR:
         teleport_player(player_ptr, plev * 5, TELEPORT_SPONTANEOUS);
         break;
-    case ROBE_DUST:
+    case mind_mirror_master_type::ROBE_DUST:
         set_dustrobe(player_ptr, 20 + randint1(20), false);
         break;
-    case BANISHING_MIRROR:
+    case mind_mirror_master_type::BANISHING_MIRROR:
         if (!get_aim_dir(player_ptr, &dir)) {
             return false;
         }
 
         (void)fire_beam(player_ptr, AttributeType::AWAY_ALL, dir, plev);
         break;
-    case MIRROR_CRASHING:
+    case mind_mirror_master_type::MIRROR_CRASHING:
         if (!get_aim_dir(player_ptr, &dir)) {
             return false;
         }
 
         fire_ball(player_ptr, AttributeType::SHARDS, dir, damroll(8 + ((plev - 5) / 4), 8), (plev > 20 ? (plev - 20) / 8 + 1 : 0));
         break;
-    case SLEEPING_MIRROR:
+    case mind_mirror_master_type::SLEEPING_MIRROR:
         for (x = 0; x < player_ptr->current_floor_ptr->width; x++) {
             for (y = 0; y < player_ptr->current_floor_ptr->height; y++) {
                 if (player_ptr->current_floor_ptr->grid_array[y][x].is_mirror()) {
@@ -388,17 +388,17 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
         }
 
         break;
-    case SEEKER_RAY:
+    case mind_mirror_master_type::SEEKER_RAY:
         if (!get_aim_dir(player_ptr, &dir)) {
             return false;
         }
 
         SpellsMirrorMaster(player_ptr).seeker_ray(dir, damroll(11 + (plev - 5) / 4, 8));
         break;
-    case SEALING_MIRROR:
+    case mind_mirror_master_type::SEALING_MIRROR:
         SpellsMirrorMaster(player_ptr).seal_of_mirror(plev * 4 + 100);
         break;
-    case WATER_SHIELD:
+    case mind_mirror_master_type::WATER_SHIELD:
         t = 20 + randint1(20);
         set_shield(player_ptr, t, false);
         if (plev > 31) {
@@ -410,14 +410,14 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
         }
 
         break;
-    case SUPER_RAY:
+    case mind_mirror_master_type::SUPER_RAY:
         if (!get_aim_dir(player_ptr, &dir)) {
             return false;
         }
 
         SpellsMirrorMaster(player_ptr).super_ray(dir, damroll(11 + (plev - 5) / 4, 8));
         break;
-    case ILLUSION_LIGHT:
+    case mind_mirror_master_type::ILLUSION_LIGHT:
         tmp = g_ptr->is_mirror() ? 4 : 3;
         slow_monsters(player_ptr, plev);
         stun_monsters(player_ptr, plev * tmp * 2);
@@ -425,7 +425,7 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
         turn_monsters(player_ptr, plev * tmp);
         stasis_monsters(player_ptr, plev * tmp);
         break;
-    case MIRROR_SHIFT:
+    case mind_mirror_master_type::MIRROR_SHIFT:
         if (!g_ptr->is_mirror()) {
             msg_print(_("鏡の国の場所がわからない！", "You cannot find out where the mirror is!"));
             break;
@@ -433,21 +433,21 @@ bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell)
 
         reserve_alter_reality(player_ptr, randint0(21) + 15);
         break;
-    case MIRROR_TUNNEL:
+    case mind_mirror_master_type::MIRROR_TUNNEL:
         msg_print(_("鏡の世界を通り抜け…  ", "You try to enter the mirror..."));
         return SpellsMirrorMaster(player_ptr).mirror_tunnel();
-    case RECALL_MIRROR:
+    case mind_mirror_master_type::RECALL_MIRROR:
         return recall_player(player_ptr, randint0(21) + 15);
-    case MULTI_SHADOW:
+    case mind_mirror_master_type::MULTI_SHADOW:
         set_multishadow(player_ptr, 6 + randint1(6), false);
         break;
-    case BINDING_FIELD:
+    case mind_mirror_master_type::BINDING_FIELD:
         if (!binding_field(player_ptr, plev * 11 + 5)) {
             msg_print(_("適当な鏡を選べなかった！", "You were not able to choose suitable mirrors!"));
         }
 
         break;
-    case RUFFNOR_MIRROR:
+    case mind_mirror_master_type::RUFFNOR_MIRROR:
         (void)set_invuln(player_ptr, randint1(4) + 4, false);
         break;
     default:

diff --git a/src/mind/mind-mirror-master.h b/src/mind/mind-mirror-master.h
index e9fd470..506ea53 100644 (file)
--- a/src/mind/mind-mirror-master.h
+++ b/src/mind/mind-mirror-master.h
@@ -9,5 +9,5 @@ bool confusing_light(PlayerType *player_ptr);
 bool set_multishadow(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);
 bool set_dustrobe(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);
 
-enum mind_mirror_master_type : int;
+enum class mind_mirror_master_type : int;
 bool cast_mirror_spell(PlayerType *player_ptr, mind_mirror_master_type spell);

diff --git a/src/mind/mind-numbers.h b/src/mind/mind-numbers.h
index 5364437..6d214a4 100644 (file)
--- a/src/mind/mind-numbers.h
+++ b/src/mind/mind-numbers.h
@@ -42,7 +42,7 @@ enum class MindMindcrafterType : int {
     THE_WORLD = 13,
 };
 
-enum mind_mirror_master_type : int {
+enum class mind_mirror_master_type : int {
     MIRROR_SEEING = 0,
     MAKE_MIRROR = 1,
     DRIP_LIGHT = 2,