From bde2aa8258b33e5845a592f01172d7ff860c37ff Mon Sep 17 00:00:00 2001
From: Deskull <61610939+sikabane-works@users.noreply.github.com>
Date: Mon, 1 Nov 2021 01:58:38 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20spell=5Ftype=E3=80=80=E5=88=97?=
 =?utf8?q?=E6=8C=99=E5=B8=AF=E3=81=AB=E3=80=80enum=E3=80=80=E3=82=92?=
 =?utf8?q?=E3=81=A4=E3=81=91=E3=80=80SpellProcessType=E3=80=80=E3=81=AB?=
 =?utf8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-action/cmd-hissatsu.cpp          |  8 ++++----
 src/cmd-action/cmd-spell.cpp             | 18 +++++++++---------
 src/io-dump/special-class-dump.cpp       | 12 ++++++------
 src/knowledge/knowledge-experiences.cpp  |  4 ++--
 src/player/player-status.cpp             | 12 ++++++------
 src/realm/realm-arcane.cpp               | 14 +++++++-------
 src/realm/realm-arcane.h                 |  2 +-
 src/realm/realm-chaos.cpp                | 14 +++++++-------
 src/realm/realm-chaos.h                  |  2 +-
 src/realm/realm-craft.cpp                | 14 +++++++-------
 src/realm/realm-craft.h                  |  2 +-
 src/realm/realm-crusade.cpp              | 14 +++++++-------
 src/realm/realm-crusade.h                |  2 +-
 src/realm/realm-death.cpp                | 14 +++++++-------
 src/realm/realm-death.h                  |  2 +-
 src/realm/realm-demon.cpp                | 14 +++++++-------
 src/realm/realm-demon.h                  |  2 +-
 src/realm/realm-hex.cpp                  | 22 +++++++++++-----------
 src/realm/realm-hex.h                    |  2 +-
 src/realm/realm-hissatsu.cpp             | 12 ++++++------
 src/realm/realm-hissatsu.h               |  2 +-
 src/realm/realm-life.cpp                 | 14 +++++++-------
 src/realm/realm-life.h                   |  2 +-
 src/realm/realm-nature.cpp               | 14 +++++++-------
 src/realm/realm-nature.h                 |  2 +-
 src/realm/realm-song.cpp                 | 20 ++++++++++----------
 src/realm/realm-song.h                   |  2 +-
 src/realm/realm-sorcery.cpp              | 14 +++++++-------
 src/realm/realm-sorcery.h                |  2 +-
 src/realm/realm-trump.cpp                | 16 ++++++++--------
 src/realm/realm-trump.h                  |  2 +-
 src/spell-realm/spells-hex.cpp           | 12 ++++++------
 src/spell-realm/spells-song.cpp          |  4 ++--
 src/spell/spell-info.cpp                 |  6 +++---
 src/spell/spells-execution.cpp           |  2 +-
 src/spell/spells-execution.h             |  2 +-
 src/spell/spells-util.h                  | 16 ++++++++--------
 src/window/display-sub-window-spells.cpp |  2 +-
 src/wizard/wizard-spoiler.cpp            |  2 +-
 39 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp
index b13609d88..63e327fc8 100644
--- a/src/cmd-action/cmd-hissatsu.cpp
+++ b/src/cmd-action/cmd-hissatsu.cpp
@@ -228,7 +228,7 @@ static int get_hissatsu_power(player_type *player_ptr, SPELL_IDX *sn)
                     }
 
                     /* Dump the spell --(-- */
-                    strcat(psi_desc, format(" %-18s%2d %3d", exe_spell(player_ptr, REALM_HISSATSU, i, SPELL_NAME), spell.slevel, spell.smana));
+                    strcat(psi_desc, format(" %-18s%2d %3d", exe_spell(player_ptr, REALM_HISSATSU, i, SpellProcessType::NAME), spell.slevel, spell.smana));
                     prt(psi_desc, y + (line % 17) + (line >= 17), x + (line / 17) * 30);
                     prt("", y + (line % 17) + (line >= 17) + 1, x + (line / 17) * 30);
                 }
@@ -276,7 +276,7 @@ static int get_hissatsu_power(player_type *player_ptr, SPELL_IDX *sn)
             char tmp_val[160];
 
             /* Prompt */
-            (void)strnfmt(tmp_val, 78, _("%sを使いますか？", "Use %s? "), exe_spell(player_ptr, REALM_HISSATSU, j, SPELL_NAME));
+            (void)strnfmt(tmp_val, 78, _("%sを使いますか？", "Use %s? "), exe_spell(player_ptr, REALM_HISSATSU, j, SpellProcessType::NAME));
 
             /* Belay that order */
             if (!get_check(tmp_val))
@@ -345,7 +345,7 @@ void do_cmd_hissatsu(player_type *player_ptr)
 
     sound(SOUND_ZAP);
 
-    if (!exe_spell(player_ptr, REALM_HISSATSU, n, SPELL_CAST))
+    if (!exe_spell(player_ptr, REALM_HISSATSU, n, SpellProcessType::CAST))
         return;
 
     PlayerEnergy(player_ptr).set_player_turn_energy(100);
@@ -406,7 +406,7 @@ void do_cmd_gain_hissatsu(player_type *player_ptr)
 
         player_ptr->spell_learned1 |= (1UL << i);
         player_ptr->spell_worked1 |= (1UL << i);
-        msg_format(_("%sの技を覚えた。", "You have learned the special attack of %s."), exe_spell(player_ptr, REALM_HISSATSU, i, SPELL_NAME));
+        msg_format(_("%sの技を覚えた。", "You have learned the special attack of %s."), exe_spell(player_ptr, REALM_HISSATSU, i, SpellProcessType::NAME));
         for (j = 0; j < 64; j++) {
             /* Stop at the first empty space */
             if (player_ptr->spell_order[j] == 99)
diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index ba84db59b..ff830d9c8 100644
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -502,10 +502,10 @@ static int get_spell(player_type *player_ptr, SPELL_IDX *sn, concptr prompt, OBJ
 #ifdef JP
             jverb(prompt, jverb_buf, JVERB_AND);
             /* 英日切り替え機能に対応 */
-            (void)strnfmt(tmp_val, 78, "%s(MP%d, 失敗率%d%%)を%sますか? ", exe_spell(player_ptr, use_realm, spell, SPELL_NAME), need_mana,
+            (void)strnfmt(tmp_val, 78, "%s(MP%d, 失敗率%d%%)を%sますか? ", exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), need_mana,
                 spell_chance(player_ptr, spell, use_realm), jverb_buf);
 #else
-            (void)strnfmt(tmp_val, 78, "%^s %s (%d mana, %d%% fail)? ", prompt, exe_spell(player_ptr, use_realm, spell, SPELL_NAME), need_mana,
+            (void)strnfmt(tmp_val, 78, "%^s %s (%d mana, %d%% fail)? ", prompt, exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), need_mana,
                 spell_chance(player_ptr, spell, use_realm));
 #endif
 
@@ -699,7 +699,7 @@ void do_cmd_browse(player_type *player_ptr)
         term_erase(14, 12, 255);
         term_erase(14, 11, 255);
 
-        shape_buffer(exe_spell(player_ptr, use_realm, spell, SPELL_DESCRIPTION), 62, temp, sizeof(temp));
+        shape_buffer(exe_spell(player_ptr, use_realm, spell, SpellProcessType::DESCRIPTION), 62, temp, sizeof(temp));
 
         for (j = 0, line = 11; temp[j]; j += 1 + strlen(&temp[j])) {
             prt(&temp[j], line, 15);
@@ -881,7 +881,7 @@ void do_cmd_study(player_type *player_ptr)
     if (learned) {
         auto max_exp = PlayerSkill::spell_exp_at((spell < 32) ? PlayerSkillRank::MASTER : PlayerSkillRank::EXPERT);
         int old_exp = player_ptr->spell_exp[spell];
-        concptr name = exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SPELL_NAME);
+        concptr name = exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SpellProcessType::NAME);
 
         if (old_exp >= max_exp) {
             msg_format(_("その%sは完全に使いこなせるので学ぶ必要はない。", "You don't need to study this %s anymore."), p);
@@ -914,12 +914,12 @@ void do_cmd_study(player_type *player_ptr)
 #ifdef JP
         /* 英日切り替え機能に対応 */
         if (mp_ptr->spell_book == ItemKindType::MUSIC_BOOK) {
-            msg_format("%sを学んだ。", exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SPELL_NAME));
+            msg_format("%sを学んだ。", exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SpellProcessType::NAME));
         } else {
-            msg_format("%sの%sを学んだ。", exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SPELL_NAME), p);
+            msg_format("%sの%sを学んだ。", exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SpellProcessType::NAME), p);
         }
 #else
-        msg_format("You have learned the %s of %s.", p, exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SPELL_NAME));
+        msg_format("You have learned the %s of %s.", p, exe_spell(player_ptr, increment ? player_ptr->realm2 : player_ptr->realm1, spell % 32, SpellProcessType::NAME));
 #endif
     }
 
@@ -1154,7 +1154,7 @@ bool do_cmd_cast(player_type *player_ptr)
         }
 
         /* Failure casting may activate some side effect */
-        exe_spell(player_ptr, realm, spell, SPELL_FAIL);
+        exe_spell(player_ptr, realm, spell, SpellProcessType::FAIL);
 
         if ((o_ptr->tval == ItemKindType::CHAOS_BOOK) && (randint1(100) < spell)) {
             msg_print(_("カオス的な効果を発生した！", "You produce a chaotic effect!"));
@@ -1180,7 +1180,7 @@ bool do_cmd_cast(player_type *player_ptr)
     /* Process spell */
     else {
         /* Canceled spells cost neither a turn nor mana */
-        if (!exe_spell(player_ptr, realm, spell, SPELL_CAST))
+        if (!exe_spell(player_ptr, realm, spell, SpellProcessType::CAST))
             return false;
 
         if (randint1(100) < chance)
diff --git a/src/io-dump/special-class-dump.cpp b/src/io-dump/special-class-dump.cpp
index d91577842..ae5621f9b 100644
--- a/src/io-dump/special-class-dump.cpp
+++ b/src/io-dump/special-class-dump.cpp
@@ -126,14 +126,14 @@ static void dump_smith(player_type *player_ptr, FILE *fff)
  * @brief ダンプする情報に学習済魔法の種類を追加する
  * @param p ダンプ用のバッファ
  * @param col 行数
- * @param spell_type 魔法の種類
+ * @param SpellProcessType 魔法の種類
  * @param learnt_spell_ptr 学習済魔法のテーブル
  */
-static void add_monster_spell_type(char p[][80], int col, BlueMagicType spell_type, learnt_spell_table *learnt_spell_ptr)
+static void add_monster_spell_type(char p[][80], int col, BlueMagicType SpellProcessType, learnt_spell_table *learnt_spell_ptr)
 {
     learnt_spell_ptr->ability_flags.clear();
-    set_rf_masks(learnt_spell_ptr->ability_flags, spell_type);
-    switch (spell_type) {
+    set_rf_masks(learnt_spell_ptr->ability_flags, SpellProcessType);
+    switch (SpellProcessType) {
     case BlueMagicType::BOLT:
         strcat(p[col], _("\n     [ボルト型]\n", "\n     [Bolt  Type]\n"));
         break;
@@ -176,10 +176,10 @@ static void dump_blue_mage(player_type *player_ptr, FILE *fff)
     int col = 0;
     strcat(p[col], _("\n\n  [学習済みの青魔法]\n", "\n\n  [Learned Blue Magic]\n"));
 
-    for (auto spell_type : BLUE_MAGIC_TYPE_LIST) {
+    for (auto SpellProcessType : BLUE_MAGIC_TYPE_LIST) {
         col++;
         learnt_spell_table learnt_magic;
-        add_monster_spell_type(p, col, spell_type, &learnt_magic);
+        add_monster_spell_type(p, col, SpellProcessType, &learnt_magic);
         learnt_magic.ability_flags &= bluemage_data->learnt_blue_magics;
 
         std::vector<RF_ABILITY> learnt_spells;
diff --git a/src/knowledge/knowledge-experiences.cpp b/src/knowledge/knowledge-experiences.cpp
index 7a74a4302..da86d1144 100644
--- a/src/knowledge/knowledge-experiences.cpp
+++ b/src/knowledge/knowledge-experiences.cpp
@@ -90,7 +90,7 @@ void do_cmd_knowledge_spell_exp(player_type *player_ptr)
                 continue;
             SUB_EXP spell_exp = player_ptr->spell_exp[i];
             auto skill_rank = PlayerSkill::spell_skill_rank(spell_exp);
-            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm1, i, SPELL_NAME));
+            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm1, i, SpellProcessType::NAME));
             if (player_ptr->realm1 == REALM_HISSATSU) {
                 if (show_actual_value)
                     fprintf(fff, "----/---- ");
@@ -126,7 +126,7 @@ void do_cmd_knowledge_spell_exp(player_type *player_ptr)
 
             SUB_EXP spell_exp = player_ptr->spell_exp[i + 32];
             auto skill_rank = PlayerSkill::spell_skill_rank(spell_exp);
-            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm2, i, SPELL_NAME));
+            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm2, i, SpellProcessType::NAME));
             if (show_actual_value)
                 fprintf(fff, "%4d/%4d ", spell_exp, PlayerSkill::spell_exp_at(PlayerSkillRank::MASTER));
             if (skill_rank >= PlayerSkillRank::EXPERT)
diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 1b0699822..e6461d4d6 100644
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -564,9 +564,9 @@ static void update_num_of_spells(player_type *player_ptr)
         }
 
 #ifdef JP
-        msg_format("%sの%sを忘れてしまった。", exe_spell(player_ptr, which, j % 32, SPELL_NAME), p);
+        msg_format("%sの%sを忘れてしまった。", exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME), p);
 #else
-        msg_format("You have forgotten the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SPELL_NAME));
+        msg_format("You have forgotten the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME));
 #endif
         player_ptr->new_spells++;
     }
@@ -604,9 +604,9 @@ static void update_num_of_spells(player_type *player_ptr)
         }
 
 #ifdef JP
-        msg_format("%sの%sを忘れてしまった。", exe_spell(player_ptr, which, j % 32, SPELL_NAME), p);
+        msg_format("%sの%sを忘れてしまった。", exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME), p);
 #else
-        msg_format("You have forgotten the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SPELL_NAME));
+        msg_format("You have forgotten the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME));
 #endif
         player_ptr->new_spells++;
     }
@@ -657,9 +657,9 @@ static void update_num_of_spells(player_type *player_ptr)
         }
 
 #ifdef JP
-        msg_format("%sの%sを思い出した。", exe_spell(player_ptr, which, j % 32, SPELL_NAME), p);
+        msg_format("%sの%sを思い出した。", exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME), p);
 #else
-        msg_format("You have remembered the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SPELL_NAME));
+        msg_format("You have remembered the %s of %s.", p, exe_spell(player_ptr, which, j % 32, SpellProcessType::NAME));
 #endif
         player_ptr->new_spells--;
     }
diff --git a/src/realm/realm-arcane.cpp b/src/realm/realm-arcane.cpp
index d3c16b014..72ee8fe94 100644
--- a/src/realm/realm-arcane.cpp
+++ b/src/realm/realm-arcane.cpp
@@ -29,15 +29,15 @@
  * @brief 秘術領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_arcane_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_arcane_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-arcane.h b/src/realm/realm-arcane.h
index ac86e74d0..eeaa852a4 100644
--- a/src/realm/realm-arcane.h
+++ b/src/realm/realm-arcane.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_arcane_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_arcane_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-chaos.cpp b/src/realm/realm-chaos.cpp
index b60dded81..76a0ce7c0 100644
--- a/src/realm/realm-chaos.cpp
+++ b/src/realm/realm-chaos.cpp
@@ -29,15 +29,15 @@
  * @brief カオス領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_chaos_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_chaos_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-chaos.h b/src/realm/realm-chaos.h
index a79974374..495b954b6 100644
--- a/src/realm/realm-chaos.h
+++ b/src/realm/realm-chaos.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_chaos_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_chaos_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-craft.cpp b/src/realm/realm-craft.cpp
index 32268b545..cbf00f8e1 100644
--- a/src/realm/realm-craft.cpp
+++ b/src/realm/realm-craft.cpp
@@ -23,15 +23,15 @@
 /*!
  * @brief 匠領域魔法の各処理を行う
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_craft_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_craft_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     PLAYER_LEVEL plev = player_ptr->lev;
 
diff --git a/src/realm/realm-craft.h b/src/realm/realm-craft.h
index 22f00475c..3ffc8051e 100644
--- a/src/realm/realm-craft.h
+++ b/src/realm/realm-craft.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_craft_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_craft_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-crusade.cpp b/src/realm/realm-crusade.cpp
index d80980c06..c9efe36c6 100644
--- a/src/realm/realm-crusade.cpp
+++ b/src/realm/realm-crusade.cpp
@@ -35,15 +35,15 @@
  * @brief 破邪領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_crusade_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_crusade_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-crusade.h b/src/realm/realm-crusade.h
index 82e996c2d..4b92e00b2 100644
--- a/src/realm/realm-crusade.h
+++ b/src/realm/realm-crusade.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_crusade_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_crusade_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-death.cpp b/src/realm/realm-death.cpp
index 299c7ff3b..ddbae16bb 100644
--- a/src/realm/realm-death.cpp
+++ b/src/realm/realm-death.cpp
@@ -32,15 +32,15 @@
  * @brief 暗黒領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_death_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_death_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-death.h b/src/realm/realm-death.h
index 113b117e0..0de51038d 100644
--- a/src/realm/realm-death.h
+++ b/src/realm/realm-death.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_death_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_death_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-demon.cpp b/src/realm/realm-demon.cpp
index 36032b1ee..00e8760fc 100644
--- a/src/realm/realm-demon.cpp
+++ b/src/realm/realm-demon.cpp
@@ -32,15 +32,15 @@
  * @brief 悪魔領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_daemon_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_daemon_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-demon.h b/src/realm/realm-demon.h
index a9a5eee18..30cfa27b3 100644
--- a/src/realm/realm-demon.h
+++ b/src/realm/realm-demon.h
@@ -4,5 +4,5 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_daemon_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_daemon_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
 
diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index 11429e84d..d6f9ec029 100644
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -79,17 +79,17 @@ static bool item_tester_hook_weapon_except_bow(const object_type *o_ptr)
 /*!
  * @brief 呪術領域魔法の各処理を行う
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_CONT / SPELL_STOP)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_CONT / SPELL_STOP 時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST / SPELL_CONT / SpellProcessType::STOP)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST / SPELL_CONT / SpellProcessType::STOP 時はnullptr文字列を返す。
  */
-concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type mode)
+concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, SpellProcessType mode)
 {
-    auto name = mode == SPELL_NAME;
-    auto description = mode == SPELL_DESCRIPTION;
-    auto info = mode == SPELL_INFO;
-    auto cast = mode == SPELL_CAST;
-    auto continuation = mode == SPELL_CONTNUATION;
-    auto stop = mode == SPELL_STOP;
+    auto name = mode == SpellProcessType::NAME;
+    auto description = mode == SpellProcessType::DESCRIPTION;
+    auto info = mode == SpellProcessType::INFO;
+    auto cast = mode == SpellProcessType::CAST;
+    auto continuation = mode == SpellProcessType::CONTNUATION;
+    auto stop = mode == SpellProcessType::STOP;
     auto should_continue = true;
     HIT_POINT power;
     switch (spell) {
@@ -575,7 +575,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
             object_type *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
 
             if ((!o_ptr->k_idx) || (!o_ptr->is_cursed())) {
-                exe_spell(player_ptr, REALM_HEX, spell, SPELL_STOP);
+                exe_spell(player_ptr, REALM_HEX, spell, SpellProcessType::STOP);
                 SpellHex spell_hex(player_ptr);
                 spell_hex.reset_casting_flag(spell);
                 if (!spell_hex.is_spelling_any())
@@ -662,7 +662,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
             }
 
             if (!flag) {
-                msg_format(_("%sの呪文の詠唱をやめた。", "Finish casting '%^s'."), exe_spell(player_ptr, REALM_HEX, HEX_RESTORE, SPELL_NAME));
+                msg_format(_("%sの呪文の詠唱をやめた。", "Finish casting '%^s'."), exe_spell(player_ptr, REALM_HEX, HEX_RESTORE, SpellProcessType::NAME));
                 SpellHex spell_hex(player_ptr);
                 spell_hex.reset_casting_flag(HEX_RESTORE);
                 if (!spell_hex.is_spelling_any()) {
diff --git a/src/realm/realm-hex.h b/src/realm/realm-hex.h
index ac848873a..20f5e8aca 100644
--- a/src/realm/realm-hex.h
+++ b/src/realm/realm-hex.h
@@ -5,4 +5,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type mode);
+concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, SpellProcessType mode);
diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp
index 2beb4cb26..8803ddfa5 100644
--- a/src/realm/realm-hissatsu.cpp
+++ b/src/realm/realm-hissatsu.cpp
@@ -62,14 +62,14 @@
  * @brief 剣術の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 剣術ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_hissatsu_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_hissatsu_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-hissatsu.h b/src/realm/realm-hissatsu.h
index 8093dc45d..6e5e0a9a8 100644
--- a/src/realm/realm-hissatsu.h
+++ b/src/realm/realm-hissatsu.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_hissatsu_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_hissatsu_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-life.cpp b/src/realm/realm-life.cpp
index a9b471904..40cec5477 100644
--- a/src/realm/realm-life.cpp
+++ b/src/realm/realm-life.cpp
@@ -27,15 +27,15 @@
  * @brief 生命領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_life_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_life_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-life.h b/src/realm/realm-life.h
index d4d933ddb..79963f211 100644
--- a/src/realm/realm-life.h
+++ b/src/realm/realm-life.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_life_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_life_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-nature.cpp b/src/realm/realm-nature.cpp
index 80807ce78..ebe1e7ea4 100644
--- a/src/realm/realm-nature.cpp
+++ b/src/realm/realm-nature.cpp
@@ -45,15 +45,15 @@
  * @brief 自然領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_nature_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_nature_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-nature.h b/src/realm/realm-nature.h
index f0056dd22..4b5d1267a 100644
--- a/src/realm/realm-nature.h
+++ b/src/realm/realm-nature.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_nature_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_nature_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-song.cpp b/src/realm/realm-song.cpp
index 0f031d21b..2a6f61b28 100644
--- a/src/realm/realm-song.cpp
+++ b/src/realm/realm-song.cpp
@@ -52,18 +52,18 @@ static void start_singing(player_type *player_ptr, SPELL_IDX spell, int32_t song
  * @brief 歌の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 歌ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP 時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST / SpellProcessType::FAIL / SPELL_CONT / SpellProcessType::STOP)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST / SpellProcessType::FAIL / SPELL_CONT / SpellProcessType::STOP 時はnullptr文字列を返す。
  */
-concptr do_music_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_music_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
-    bool fail = mode == SPELL_FAIL;
-    bool cont = mode == SPELL_CONTNUATION;
-    bool stop = mode == SPELL_STOP;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
+    bool fail = mode == SpellProcessType::FAIL;
+    bool cont = mode == SpellProcessType::CONTNUATION;
+    bool stop = mode == SpellProcessType::STOP;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-song.h b/src/realm/realm-song.h
index 852de4813..ea220f600 100644
--- a/src/realm/realm-song.h
+++ b/src/realm/realm-song.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_music_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_music_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-sorcery.cpp b/src/realm/realm-sorcery.cpp
index d7c552643..d573d9268 100644
--- a/src/realm/realm-sorcery.cpp
+++ b/src/realm/realm-sorcery.cpp
@@ -29,15 +29,15 @@
  * @brief 仙術領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_sorcery_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_sorcery_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-sorcery.h b/src/realm/realm-sorcery.h
index b23647f13..d12d28128 100644
--- a/src/realm/realm-sorcery.h
+++ b/src/realm/realm-sorcery.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_sorcery_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_sorcery_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/realm/realm-trump.cpp b/src/realm/realm-trump.cpp
index e7e19b81f..b96a5d4f2 100644
--- a/src/realm/realm-trump.cpp
+++ b/src/realm/realm-trump.cpp
@@ -32,16 +32,16 @@
  * @brief トランプ領域魔法の各処理を行う
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST時はnullptr文字列を返す。
  */
-concptr do_trump_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode)
+concptr do_trump_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode)
 {
-    bool name = mode == SPELL_NAME;
-    bool desc = mode == SPELL_DESCRIPTION;
-    bool info = mode == SPELL_INFO;
-    bool cast = mode == SPELL_CAST;
-    bool fail = mode == SPELL_FAIL;
+    bool name = mode == SpellProcessType::NAME;
+    bool desc = mode == SpellProcessType::DESCRIPTION;
+    bool info = mode == SpellProcessType::INFO;
+    bool cast = mode == SpellProcessType::CAST;
+    bool fail = mode == SpellProcessType::FAIL;
 
     DIRECTION dir;
     PLAYER_LEVEL plev = player_ptr->lev;
diff --git a/src/realm/realm-trump.h b/src/realm/realm-trump.h
index 6b85685c0..953ac57f0 100644
--- a/src/realm/realm-trump.h
+++ b/src/realm/realm-trump.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr do_trump_spell(player_type *player_ptr, SPELL_IDX spell, spell_type mode);
+concptr do_trump_spell(player_type *player_ptr, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index 7304b2f61..c3425142e 100644
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -67,7 +67,7 @@ SpellHex::SpellHex(player_type *player_ptr, monap_type *monap_ptr)
 void SpellHex::stop_all_spells()
 {
     for (auto spell : this->casting_spells) {
-        exe_spell(this->player_ptr, REALM_HEX, spell, SPELL_STOP);
+        exe_spell(this->player_ptr, REALM_HEX, spell, SpellProcessType::STOP);
     }
 
     this->spell_hex_data->casting_spells.clear();
@@ -108,7 +108,7 @@ bool SpellHex::stop_spells_with_selection()
     screen_load();
     if (is_selected) {
         auto n = this->casting_spells[A2I(choice)];
-        exe_spell(this->player_ptr, REALM_HEX, n, SPELL_STOP);
+        exe_spell(this->player_ptr, REALM_HEX, n, SpellProcessType::STOP);
         this->reset_casting_flag(i2enum<spell_hex_type>(n));
     }
 
@@ -161,7 +161,7 @@ void SpellHex::display_casting_spells_list()
     prt(_("     名前", "     Name"), y, x + 5);
     for (auto spell : this->casting_spells) {
         term_erase(x, y + n + 1, 255);
-        auto spell_result = exe_spell(this->player_ptr, REALM_HEX, spell, SPELL_NAME);
+        auto spell_result = exe_spell(this->player_ptr, REALM_HEX, spell, SpellProcessType::NAME);
         put_str(format("%c)  %s", I2A(n), spell_result), y + n + 1, x + 2);
         n++;
     }
@@ -192,7 +192,7 @@ void SpellHex::decrease_mana()
 
     this->gain_exp();
     for (auto spell : this->casting_spells) {
-        exe_spell(this->player_ptr, REALM_HEX, spell, SPELL_CONTNUATION);
+        exe_spell(this->player_ptr, REALM_HEX, spell, SpellProcessType::CONTNUATION);
     }
 }
 
@@ -286,10 +286,10 @@ void SpellHex::continue_revenge()
 
     switch (this->get_revenge_type()) {
     case SpellHexRevengeType::PATIENCE:
-        exe_spell(this->player_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONTNUATION);
+        exe_spell(this->player_ptr, REALM_HEX, HEX_PATIENCE, SpellProcessType::CONTNUATION);
         return;
     case SpellHexRevengeType::REVENGE:
-        exe_spell(this->player_ptr, REALM_HEX, HEX_REVENGE, SPELL_CONTNUATION);
+        exe_spell(this->player_ptr, REALM_HEX, HEX_REVENGE, SpellProcessType::CONTNUATION);
         return;
     default:
         return;
diff --git a/src/spell-realm/spells-song.cpp b/src/spell-realm/spells-song.cpp
index 9b92a4b47..dc3181b9f 100644
--- a/src/spell-realm/spells-song.cpp
+++ b/src/spell-realm/spells-song.cpp
@@ -65,7 +65,7 @@ void check_music(player_type *player_ptr)
 
     PlayerSkill(player_ptr).gain_continuous_spell_skill_exp(REALM_MUSIC, spell);
 
-    exe_spell(player_ptr, REALM_MUSIC, spell, SPELL_CONTNUATION);
+    exe_spell(player_ptr, REALM_MUSIC, spell, SpellProcessType::CONTNUATION);
 }
 
 /*!
@@ -129,7 +129,7 @@ void stop_singing(player_type *player_ptr)
     if (player_ptr->action == ACTION_SING)
         set_action(player_ptr, ACTION_NONE);
 
-    (void)exe_spell(player_ptr, REALM_MUSIC, get_singing_song_id(player_ptr), SPELL_STOP);
+    (void)exe_spell(player_ptr, REALM_MUSIC, get_singing_song_id(player_ptr), SpellProcessType::STOP);
     set_singing_song_effect(player_ptr, MUSIC_NONE);
     set_singing_song_id(player_ptr, 0);
     set_bits(player_ptr->update, PU_BONUS);
diff --git a/src/spell/spell-info.cpp b/src/spell/spell-info.cpp
index 6fb86b4f2..4f1141517 100644
--- a/src/spell/spell-info.cpp
+++ b/src/spell/spell-info.cpp
@@ -281,7 +281,7 @@ void print_spells(player_type *player_ptr, SPELL_IDX target_spell, SPELL_IDX *sp
             continue;
         }
 
-        strcpy(info, exe_spell(player_ptr, use_realm, spell, SPELL_INFO));
+        strcpy(info, exe_spell(player_ptr, use_realm, spell, SpellProcessType::INFO));
         concptr comment = info;
         byte line_attr = TERM_WHITE;
         if ((player_ptr->pclass == PlayerClassType::SORCERER) || (player_ptr->pclass == PlayerClassType::RED_MAGE)) {
@@ -307,10 +307,10 @@ void print_spells(player_type *player_ptr, SPELL_IDX target_spell, SPELL_IDX *sp
         }
 
         if (use_realm == REALM_HISSATSU) {
-            strcat(out_val, format("%-25s %2d %4d", exe_spell(player_ptr, use_realm, spell, SPELL_NAME), s_ptr->slevel, need_mana));
+            strcat(out_val, format("%-25s %2d %4d", exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), s_ptr->slevel, need_mana));
         } else {
             strcat(out_val,
-                format("%-25s%c%-4s %2d %4d %3d%% %s", exe_spell(player_ptr, use_realm, spell, SPELL_NAME), (max ? '!' : ' '), ryakuji, s_ptr->slevel,
+                format("%-25s%c%-4s %2d %4d %3d%% %s", exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), (max ? '!' : ' '), ryakuji, s_ptr->slevel,
                     need_mana, spell_chance(player_ptr, spell, use_realm), comment));
         }
 
diff --git a/src/spell/spells-execution.cpp b/src/spell/spells-execution.cpp
index 16090ad18..0269ded7c 100644
--- a/src/spell/spells-execution.cpp
+++ b/src/spell/spells-execution.cpp
@@ -22,7 +22,7 @@
  * @param mode 求める処理
  * @return 各領域魔法に各種テキストを求めた場合は文字列参照ポインタ、そうでない場合はnullptrを返す。
  */
-concptr exe_spell(player_type *player_ptr, int16_t realm, SPELL_IDX spell, spell_type mode)
+concptr exe_spell(player_type *player_ptr, int16_t realm, SPELL_IDX spell, SpellProcessType mode)
 {
 	switch (realm)
 	{
diff --git a/src/spell/spells-execution.h b/src/spell/spells-execution.h
index 8b67d163c..8dc85f545 100644
--- a/src/spell/spells-execution.h
+++ b/src/spell/spells-execution.h
@@ -4,4 +4,4 @@
 #include "spell/spells-util.h"
 
 struct player_type;
-concptr exe_spell(player_type *player_ptr, int16_t realm, SPELL_IDX spell, spell_type mode);
+concptr exe_spell(player_type *player_ptr, int16_t realm, SPELL_IDX spell, SpellProcessType mode);
diff --git a/src/spell/spells-util.h b/src/spell/spells-util.h
index caeabcf8d..b22617144 100644
--- a/src/spell/spells-util.h
+++ b/src/spell/spells-util.h
@@ -4,14 +4,14 @@
 #define DETECT_RAD_MAP 30
 #define DETECT_RAD_ALL 255
 
-enum spell_type {
-    SPELL_NAME = 0,
-    SPELL_DESCRIPTION = 1,
-    SPELL_INFO = 2,
-    SPELL_CAST = 3,
-    SPELL_FAIL = 4,
-    SPELL_STOP = 5,
-    SPELL_CONTNUATION = 6
+enum class SpellProcessType {
+    NAME = 0,
+    DESCRIPTION = 1,
+    INFO = 2,
+    CAST = 3,
+    FAIL = 4,
+    STOP = 5,
+    CONTNUATION = 6
 };
 
 enum spell_operation {
diff --git a/src/window/display-sub-window-spells.cpp b/src/window/display-sub-window-spells.cpp
index 0c331a35d..455887975 100644
--- a/src/window/display-sub-window-spells.cpp
+++ b/src/window/display-sub-window-spells.cpp
@@ -146,7 +146,7 @@ static void display_spell_list(player_type *player_ptr)
                 s_ptr = &mp_ptr->info[((j < 1) ? player_ptr->realm1 : player_ptr->realm2) - 1][i % 32];
             }
 
-            strcpy(name, exe_spell(player_ptr, (j < 1) ? player_ptr->realm1 : player_ptr->realm2, i % 32, SPELL_NAME));
+            strcpy(name, exe_spell(player_ptr, (j < 1) ? player_ptr->realm1 : player_ptr->realm2, i % 32, SpellProcessType::NAME));
 
             if (s_ptr->slevel >= 99) {
                 strcpy(name, _("(判読不能)", "(illegible)"));
diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 7bd99d5a9..413cad9ae 100644
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -226,7 +226,7 @@ static spoiler_output_status spoil_player_spell(concptr fname)
             spoil_out("Name                     Lv Cst Dif Exp\n");
             for (SPELL_IDX i = 0; i < 32; i++) {
                 auto spell_ptr = &magic_ptr->info[r][i];
-                auto spell_name = exe_spell(&dummy_p, r, i, SPELL_NAME);
+                auto spell_name = exe_spell(&dummy_p, r, i, SpellProcessType::NAME);
                 sprintf(buf, "%-24s %2d %3d %3d %3d\n", spell_name, spell_ptr->slevel, spell_ptr->smana, spell_ptr->sfail, spell_ptr->sexp);
                 spoil_out(buf);
             }
-- 
2.11.0