From 82777e390985786a7c7f5e7ee020a4541a13766f Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Tue, 21 Jul 2020 19:57:10 +0900
Subject: [PATCH] [Refactor] #40481 Separated switch_cast_blue_magic() from
 cast_learned_spell()

---
 src/blue-magic/blue-magic-caster.c | 420 ++++++++++---------------------------
 src/blue-magic/blue-magic-caster.h |   2 +-
 2 files changed, 110 insertions(+), 312 deletions(-)

diff --git a/src/blue-magic/blue-magic-caster.c b/src/blue-magic/blue-magic-caster.c
index 6cdeeac34..872e29bab 100644
--- a/src/blue-magic/blue-magic-caster.c
+++ b/src/blue-magic/blue-magic-caster.c
@@ -401,436 +401,234 @@ bool cast_blue_summon_unique(player_type *caster_ptr, bmc_type *bmc_ptr)
     return TRUE;
 }
 
-/*!
- * @brief 青魔法の発動 /
- * do_cmd_cast calls this function if the player's class is 'blue-mage'.
- * @param spell 発動するモンスター攻撃のID
- * @param success TRUEは成功時、FALSEは失敗時の処理を行う
- * @return 処理を実行したらTRUE、キャンセルした場合FALSEを返す。
- */
-bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
+bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, SPELL_IDX spell)
 {
-    bmc_type tmp_bm;
-    bmc_type *bmc_ptr = initialize_blue_magic_type(caster_ptr, &tmp_bm, success, get_pseudo_monstetr_level);
     switch (spell) {
     case MS_SHRIEK:
         msg_print(_("かん高い金切り声をあげた。", "You make a high pitched shriek."));
         aggravate_monsters(caster_ptr, 0);
-        break; // 関数分割後に'return TRUE;' に差し替え.
+        return TRUE;
     case MS_XXX1:
     case MS_XXX2:
     case MS_XXX3:
     case MS_XXX4:
-        break; // 関数分割後に'return TRUE;' に差し替え.
+        return TRUE;
     case MS_DISPEL:
-        if (!cast_blue_dispel(caster_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_dispel(caster_ptr);
     case MS_ROCKET:
-        if (!cast_blue_rocket(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_rocket(caster_ptr, bmc_ptr);
     case MS_SHOOT:
-        if (!cast_blue_shoot(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_shoot(caster_ptr, bmc_ptr);
     case MS_BR_ACID:
-        if (!cast_blue_breath_acid(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_acid(caster_ptr, bmc_ptr);
     case MS_BR_ELEC:
-        if (!cast_blue_breath_elec(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_elec(caster_ptr, bmc_ptr);
     case MS_BR_FIRE:
-        if (!cast_blue_breath_fire(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_fire(caster_ptr, bmc_ptr);
     case MS_BR_COLD:
-        if (!cast_blue_breath_cold(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_cold(caster_ptr, bmc_ptr);
     case MS_BR_POIS:
-        if (!cast_blue_breath_pois(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_pois(caster_ptr, bmc_ptr);
     case MS_BR_NETHER:
-        if (!cast_blue_breath_nether(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_nether(caster_ptr, bmc_ptr);
     case MS_BR_LITE:
-        if (!cast_blue_breath_lite(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_lite(caster_ptr, bmc_ptr);
     case MS_BR_DARK:
-        if (!cast_blue_breath_dark(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_dark(caster_ptr, bmc_ptr);
     case MS_BR_CONF:
-        if (!cast_blue_breath_conf(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_conf(caster_ptr, bmc_ptr);
     case MS_BR_SOUND:
-        if (!cast_blue_breath_sound(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_sound(caster_ptr, bmc_ptr);
     case MS_BR_CHAOS:
-        if (!cast_blue_breath_chaos(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_chaos(caster_ptr, bmc_ptr);
     case MS_BR_DISEN:
-        if (!cast_blue_breath_disenchant(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_disenchant(caster_ptr, bmc_ptr);
     case MS_BR_NEXUS:
-        if (!cast_blue_breath_nexus(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_nexus(caster_ptr, bmc_ptr);
     case MS_BR_TIME:
-        if (!cast_blue_breath_time(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_time(caster_ptr, bmc_ptr);
     case MS_BR_INERTIA:
-        if (!cast_blue_breath_inertia(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_inertia(caster_ptr, bmc_ptr);
     case MS_BR_GRAVITY:
-        if (!cast_blue_breath_gravity(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_gravity(caster_ptr, bmc_ptr);
     case MS_BR_SHARDS:
-        if (!cast_blue_breath_shards(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_shards(caster_ptr, bmc_ptr);
     case MS_BR_PLASMA:
-        if (!cast_blue_breath_plasma(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_plasma(caster_ptr, bmc_ptr);
     case MS_BR_FORCE:
-        if (!cast_blue_breath_force(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_force(caster_ptr, bmc_ptr);
     case MS_BR_MANA:
-        if (!cast_blue_breath_mana(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_mana(caster_ptr, bmc_ptr);
     case MS_BR_NUKE:
-        if (!cast_blue_breath_nuke(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_nuke(caster_ptr, bmc_ptr);
     case MS_BR_DISI:
-        if (!cast_blue_breath_disintegration(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_breath_disintegration(caster_ptr, bmc_ptr);
     case MS_BALL_ACID:
-        if (!cast_blue_ball_acid(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_acid(caster_ptr, bmc_ptr);
     case MS_BALL_ELEC:
-        if (!cast_blue_ball_elec(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_elec(caster_ptr, bmc_ptr);
     case MS_BALL_FIRE:
-        if (!cast_blue_ball_fire(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_fire(caster_ptr, bmc_ptr);
     case MS_BALL_COLD:
-        if (!cast_blue_ball_cold(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_cold(caster_ptr, bmc_ptr);
     case MS_BALL_POIS:
-        if (!cast_blue_ball_pois(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_pois(caster_ptr, bmc_ptr);
     case MS_BALL_NUKE:
-        if (!cast_blue_ball_nuke(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_nuke(caster_ptr, bmc_ptr);
     case MS_BALL_NETHER:
-        if (!cast_blue_ball_nether(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_nether(caster_ptr, bmc_ptr);
     case MS_BALL_CHAOS:
-        if (!cast_blue_ball_chaos(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_chaos(caster_ptr, bmc_ptr);
     case MS_BALL_WATER:
-        if (!cast_blue_ball_water(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_water(caster_ptr, bmc_ptr);
     case MS_STARBURST:
-        if (!cast_blue_ball_star_burst(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_star_burst(caster_ptr, bmc_ptr);
     case MS_BALL_DARK:
-        if (!cast_blue_ball_dark_storm(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_dark_storm(caster_ptr, bmc_ptr);
     case MS_BALL_MANA:
-        if (!cast_blue_ball_mana_storm(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_ball_mana_storm(caster_ptr, bmc_ptr);
     case MS_DRAIN_MANA:
-        if (!cast_blue_drain_mana(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_drain_mana(caster_ptr, bmc_ptr);
     case MS_MIND_BLAST:
-        if (!cast_blue_mind_blast(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_mind_blast(caster_ptr, bmc_ptr);
     case MS_BRAIN_SMASH:
-        if (!cast_blue_brain_smash(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_brain_smash(caster_ptr, bmc_ptr);
     case MS_CAUSE_1:
-        if (!cast_blue_curse_1(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_curse_1(caster_ptr, bmc_ptr);
     case MS_CAUSE_2:
-        if (!cast_blue_curse_2(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_curse_2(caster_ptr, bmc_ptr);
     case MS_CAUSE_3:
-        if (!cast_blue_curse_3(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_curse_3(caster_ptr, bmc_ptr);
     case MS_CAUSE_4:
-        if (!cast_blue_curse_4(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_curse_4(caster_ptr, bmc_ptr);
     case MS_BOLT_ACID:
-        if (!cast_blue_bolt_acid(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_acid(caster_ptr, bmc_ptr);
     case MS_BOLT_ELEC:
-        if (!cast_blue_bolt_elec(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_elec(caster_ptr, bmc_ptr);
     case MS_BOLT_FIRE:
-        if (!cast_blue_bolt_fire(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return !cast_blue_bolt_fire(caster_ptr, bmc_ptr);
     case MS_BOLT_COLD:
-        if (!cast_blue_bolt_cold(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_cold(caster_ptr, bmc_ptr);
     case MS_BOLT_NETHER:
-        if (!cast_blue_bolt_nether(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_nether(caster_ptr, bmc_ptr);
     case MS_BOLT_WATER:
-        if (!cast_blue_bolt_water(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_water(caster_ptr, bmc_ptr);
     case MS_BOLT_MANA:
-        if (!cast_blue_bolt_mana(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_mana(caster_ptr, bmc_ptr);
     case MS_BOLT_PLASMA:
-        if (!cast_blue_bolt_plasma(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_plasma(caster_ptr, bmc_ptr);
     case MS_BOLT_ICE:
-        if (!cast_blue_bolt_icee(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_icee(caster_ptr, bmc_ptr);
     case MS_MAGIC_MISSILE:
-        if (!cast_blue_bolt_missile(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_bolt_missile(caster_ptr, bmc_ptr);
     case MS_SCARE:
-        if (!cast_blue_scare(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_scare(caster_ptr, bmc_ptr);
     case MS_BLIND:
-        if (!cast_blue_blind(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_blind(caster_ptr, bmc_ptr);
     case MS_CONF:
-        if (!cast_blue_confusion(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_confusion(caster_ptr, bmc_ptr);
     case MS_SLOW:
-        if (!cast_blue_slow(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_slow(caster_ptr, bmc_ptr);
     case MS_SLEEP:
-        if (!cast_blue_sleep(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_sleep(caster_ptr, bmc_ptr);
     case MS_SPEED:
         (void)set_fast(caster_ptr, randint1(20 + bmc_ptr->plev) + bmc_ptr->plev, FALSE);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_HAND_DOOM:
-        if (!cast_blue_hand_doom(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_hand_doom(caster_ptr, bmc_ptr);
     case MS_HEAL:
         msg_print(_("自分の傷に念を集中した。", "You concentrate on your wounds!"));
         (void)hp_player(caster_ptr, bmc_ptr->plev * 4);
         (void)set_stun(caster_ptr, 0);
         (void)set_cut(caster_ptr, 0);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_INVULNER:
         msg_print(_("無傷の球の呪文を唱えた。", "You cast a Globe of Invulnerability."));
         (void)set_invuln(caster_ptr, randint1(4) + 4, FALSE);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_BLINK:
         teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_TELEPORT:
         teleport_player(caster_ptr, bmc_ptr->plev * 5, TELEPORT_SPONTANEOUS);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_WORLD:
         (void)time_walk(caster_ptr);
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_SPECIAL:
-        break; // 関数分割後に'return TRUE;' に差し替え
+        return TRUE;
     case MS_TELE_TO:
-        if (!cast_blue_teleport_back(caster_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_teleport_back(caster_ptr);
     case MS_TELE_AWAY:
-        if (!cast_blue_teleport_away(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_teleport_away(caster_ptr, bmc_ptr);
     case MS_TELE_LEVEL:
         return teleport_level_other(caster_ptr);
     case MS_PSY_SPEAR:
-        if (!cast_blue_psy_spear(caster_ptr, bmc_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_psy_spear(caster_ptr, bmc_ptr);
     case MS_DARKNESS:
         msg_print(_("暗闇の中で手を振った。", "You gesture in shadow."));
         (void)unlite_area(caster_ptr, 10, 3);
-        break;
+        return TRUE;
     case MS_MAKE_TRAP:
-        if (!cast_blue_make_trap(caster_ptr))
-            return FALSE;
-
-        break;
+        return cast_blue_make_trap(caster_ptr);
     case MS_FORGET:
         msg_print(_("しかし何も起きなかった。", "Nothing happen."));
-        break; // 関数分割後に'return TRUE;' に差し替え.
+        return TRUE;
     case MS_RAISE_DEAD:
         msg_print(_("死者復活の呪文を唱えた。", "You animate the dead."));
         (void)animate_dead(caster_ptr, 0, caster_ptr->y, caster_ptr->x);
-        break; // 関数分割後に'return TRUE;' に差し替え.
+        return TRUE;
     case MS_S_KIN:
-        (void)cast_blue_summon_kin(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_kin(caster_ptr, bmc_ptr);
     case MS_S_CYBER:
-        (void)cast_blue_summon_cyber(caster_ptr, bmc_ptr);
-        break;
+        return cast_blue_summon_cyber(caster_ptr, bmc_ptr);
     case MS_S_MONSTER:
-        (void)cast_blue_summon_monster(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_monster(caster_ptr, bmc_ptr);
     case MS_S_MONSTERS:
-        (void)cast_blue_summon_monsters(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_monsters(caster_ptr, bmc_ptr);
     case MS_S_ANT:
-        (void)cast_blue_summon_ant(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_ant(caster_ptr, bmc_ptr);
     case MS_S_SPIDER:
-        (void)cast_blue_summon_spider(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_spider(caster_ptr, bmc_ptr);
     case MS_S_HOUND:
-        (void)cast_blue_summon_hound(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_hound(caster_ptr, bmc_ptr);
     case MS_S_HYDRA:
-        (void)cast_blue_summon_hydra(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_hydra(caster_ptr, bmc_ptr);
     case MS_S_ANGEL:
-        (void)cast_blue_summon_angel(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_angel(caster_ptr, bmc_ptr);
     case MS_S_DEMON:
-        (void)cast_blue_summon_demon(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_demon(caster_ptr, bmc_ptr);
     case MS_S_UNDEAD:
-        (void)cast_blue_summon_undead(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_undead(caster_ptr, bmc_ptr);
     case MS_S_DRAGON:
-        (void)cast_blue_summon_dragon(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_dragon(caster_ptr, bmc_ptr);
     case MS_S_HI_UNDEAD:
-        (void)cast_blue_summon_high_undead(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_high_undead(caster_ptr, bmc_ptr);
     case MS_S_HI_DRAGON:
-        (void)cast_blue_summon_high_dragon(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_high_dragon(caster_ptr, bmc_ptr);
     case MS_S_AMBERITE:
-        (void)cast_blue_summon_amberite(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_amberite(caster_ptr, bmc_ptr);
     case MS_S_UNIQUE:
-        (void)cast_blue_summon_unique(caster_ptr, bmc_ptr);
-        break; // 関数分割後に'return cast_...();' に差し替え.
+        return cast_blue_summon_unique(caster_ptr, bmc_ptr);
     default:
         msg_print("hoge?");
-        break; // 関数分割後に'return TRUE;' に差し替え.
+        return TRUE;
     }
+}
+
+/*!
+ * @brief 青魔法の発動 /
+ * do_cmd_cast calls this function if the player's class is 'blue-mage'.
+ * @param spell 発動するモンスター攻撃のID
+ * @param success TRUEは成功時、FALSEは失敗時の処理を行う
+ * @return 処理を実行したらTRUE、キャンセルした場合FALSEを返す。
+ */
+bool cast_learned_spell(player_type *caster_ptr, SPELL_IDX spell, const bool success)
+{
+    bmc_type tmp_bm;
+    bmc_type *bmc_ptr = initialize_blue_magic_type(caster_ptr, &tmp_bm, success, get_pseudo_monstetr_level);
+    if (switch_cast_blue_magic(caster_ptr, bmc_ptr, spell))
+        return FALSE;
 
     if (bmc_ptr->no_trump)
         msg_print(_("何も現れなかった。", "No one appeared."));
diff --git a/src/blue-magic/blue-magic-caster.h b/src/blue-magic/blue-magic-caster.h
index f49fa6dd9..5f0b27ce1 100644
--- a/src/blue-magic/blue-magic-caster.h
+++ b/src/blue-magic/blue-magic-caster.h
@@ -2,4 +2,4 @@
 
 #include "system/angband.h"
 
-bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success);
+bool cast_learned_spell(player_type *caster_ptr, SPELL_IDX spell, const bool success);
-- 
2.11.0