[Refactor] #40481 Separated blue-magic-breath.c/h from blue-magic-caster.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0791500..fe0e4c4 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -182,6 +182,7 @@
     <ClCompile Include="..\..\src\birth\initial-equipments-table.c" />\r
     <ClCompile Include="..\..\src\birth\inventory-initializer.c" />\r
     <ClCompile Include="..\..\src\birth\quick-start.c" />\r
+    <ClCompile Include="..\..\src\blue-magic\blue-magic-breath.c" />\r
     <ClCompile Include="..\..\src\blue-magic\blue-magic-caster.c" />\r
     <ClCompile Include="..\..\src\blue-magic\blue-magic-util.c" />\r
     <ClCompile Include="..\..\src\blue-magic\learnt-info.c" />\r
@@ -702,6 +703,7 @@
     <ClInclude Include="..\..\src\birth\initial-equipments-table.h" />\r
     <ClInclude Include="..\..\src\birth\inventory-initializer.h" />\r
     <ClInclude Include="..\..\src\birth\quick-start.h" />\r
+    <ClInclude Include="..\..\src\blue-magic\blue-magic-breath.h" />\r
     <ClInclude Include="..\..\src\blue-magic\blue-magic-caster.h" />\r
     <ClInclude Include="..\..\src\blue-magic\blue-magic-util.h" />\r
     <ClInclude Include="..\..\src\blue-magic\learnt-info.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index fcab0df..d631b16 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1820,6 +1820,9 @@
     <ClCompile Include="..\..\src\blue-magic\blue-magic-util.c">
       <Filter>blue-magic</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\blue-magic\blue-magic-breath.c">
+      <Filter>blue-magic</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3967,6 +3970,9 @@
     <ClInclude Include="..\..\src\blue-magic\blue-magic-util.h">
       <Filter>blue-magic</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\blue-magic\blue-magic-breath.h">
+      <Filter>blue-magic</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 95245eb..a99c5cf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,7 @@ hengband_SOURCES = \
        birth/auto-roller.c birth/auto-roller.h \
        birth/birth-wizard.c birth/birth-wizard.h \
        \
+       blue-magic/blue-magic-breath.c blue-magic/blue-magic-breath.h \
        blue-magic/blue-magic-caster.c blue-magic/blue-magic-caster.h \
        blue-magic/blue-magic-checker.c blue-magic/blue-magic-checker.h \
        blue-magic/blue-magic-util.c blue-magic/blue-magic-util.h \

diff --git a/src/blue-magic/blue-magic-breath.c b/src/blue-magic/blue-magic-breath.c
new file mode 100644 (file)
index 0000000..0bd3a40
--- /dev/null
+++ b/src/blue-magic/blue-magic-breath.c
@@ -0,0 +1,229 @@
+#include "blue-magic/blue-magic-breath.h"
+#include "blue-magic/blue-magic-util.h"
+#include "io/targeting.h"
+#include "mind/mind-blue-mage.h"
+#include "mspell/mspell-damage-calculator.h"
+#include "mspell/mspell-type.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell/spell-types.h"
+#include "view/display-messages.h"
+
+bool cast_blue_breath_acid(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("酸のブレスを吐いた。", "You breathe acid."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_ACID, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_elec(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_ELEC, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_fire(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("火炎のブレスを吐いた。", "You breathe fire."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_FIRE, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_cold(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_COLD, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_pois(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("ガスのブレスを吐いた。", "You breathe gas."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_POIS, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_POIS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_nether(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("地獄のブレスを吐いた。", "You breathe nether."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_NETHER, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_lite(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("閃光のブレスを吐いた。", "You breathe light."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_LITE, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_LITE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_dark(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_DARK, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_DARK, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_conf(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("混乱のブレスを吐いた。", "You breathe confusion."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_CONF, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_CONFUSION, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_sound(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("轟音のブレスを吐いた。", "You breathe sound."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_SOUND, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_SOUND, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_chaos(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("カオスのブレスを吐いた。", "You breathe chaos."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_CHAOS, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_CHAOS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_disenchant(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_DISEN, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_DISENCHANT, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_nexus(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_NEXUS, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_NEXUS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_time(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_TIME, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_TIME, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_inertia(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_INERTIA, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_INERTIAL, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_gravity(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_GRAVITY, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_GRAVITY, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_shards(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_SHARDS, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_SHARDS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_plasma(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_PLASMA, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_PLASMA, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_force(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_FORCE, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_FORCE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}
+
+bool cast_blue_breath_mana(player_type *caster_ptr, bmc_type *bmc_ptr)
+{
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
+        return FALSE;
+
+    msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, MS_BR_MANA, bmc_ptr->plev, DAM_ROLL);
+    fire_breath(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
+    return TRUE;
+}

diff --git a/src/blue-magic/blue-magic-breath.h b/src/blue-magic/blue-magic-breath.h
new file mode 100644 (file)
index 0000000..6060835
--- /dev/null
+++ b/src/blue-magic/blue-magic-breath.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "system/angband.h"
+
+typedef struct bmc_type bmc_type;
+bool cast_blue_breath_acid(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_elec(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_fire(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_cold(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_pois(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_nether(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_lite(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_dark(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_conf(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_sound(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_chaos(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_disenchant(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_nexus(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_time(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_inertia(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_gravity(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_shards(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_plasma(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_force(player_type *caster_ptr, bmc_type *bmc_ptr);
+bool cast_blue_breath_mana(player_type *caster_ptr, bmc_type *bmc_ptr);

diff --git a/src/blue-magic/blue-magic-caster.c b/src/blue-magic/blue-magic-caster.c
index 70eb718..33e61ac 100644 (file)
--- a/src/blue-magic/blue-magic-caster.c
+++ b/src/blue-magic/blue-magic-caster.c
@@ -1,4 +1,5 @@
 #include "blue-magic/blue-magic-caster.h"
+#include "blue-magic/blue-magic-breath.h"
 #include "blue-magic/blue-magic-util.h"
 #include "blue-magic/learnt-info.h"
 #include "core/hp-mp-processor.h"
@@ -45,245 +46,25 @@ static bool cast_blue_dispel(player_type *caster_ptr)
     return TRUE;
 }
 
-static bool cast_blue_rocket(player_type *caster_ptr, blue_magic_type *bm_ptr)
+static bool cast_blue_rocket(player_type *caster_ptr, bmc_type *bmc_ptr)
 {
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
         return FALSE;
 
     msg_print(_("ロケットを発射した。", "You fire a rocket."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_ROCKET), bm_ptr->plev, DAM_ROLL);
-    fire_rocket(caster_ptr, GF_ROCKET, bm_ptr->dir, bm_ptr->damage, 2);
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_ROCKET), bmc_ptr->plev, DAM_ROLL);
+    fire_rocket(caster_ptr, GF_ROCKET, bmc_ptr->dir, bmc_ptr->damage, 2);
     return TRUE;
 }
 
-static bool cast_blue_shoot(player_type *caster_ptr, blue_magic_type *bm_ptr)
+static bool cast_blue_shoot(player_type *caster_ptr, bmc_type *bmc_ptr)
 {
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+    if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
         return FALSE;
 
     msg_print(_("矢を放った。", "You fire an arrow."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_SHOOT), bm_ptr->plev, DAM_ROLL);
-    fire_bolt(caster_ptr, GF_ARROW, bm_ptr->dir, bm_ptr->damage);
-    return TRUE;
-}
-
-static bool cast_blue_breath_acid(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("酸のブレスを吐いた。", "You breathe acid."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_ACID), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_ACID, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_elec(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_ELEC), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_ELEC, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_fire(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("火炎のブレスを吐いた。", "You breathe fire."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_FIRE), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_FIRE, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_cold(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_COLD), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_COLD, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_pois(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("ガスのブレスを吐いた。", "You breathe gas."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_POIS), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_POIS, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_nether(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("地獄のブレスを吐いた。", "You breathe nether."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_NETHER), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_NETHER, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_lite(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("閃光のブレスを吐いた。", "You breathe light."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_LITE), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_LITE, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_dark(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_DARK), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_DARK, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_conf(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("混乱のブレスを吐いた。", "You breathe confusion."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_CONF), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_CONFUSION, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_sound(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("轟音のブレスを吐いた。", "You breathe sound."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_SOUND), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_SOUND, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_chaos(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("カオスのブレスを吐いた。", "You breathe chaos."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_CHAOS), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_CHAOS, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_disenchant(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_DISEN), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_DISENCHANT, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_nexus(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_NEXUS), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_NEXUS, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_time(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_TIME), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_TIME, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_inertia(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_INERTIA), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_INERTIAL, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_gravity(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_GRAVITY), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_GRAVITY, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_shards(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_SHARDS), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_SHARDS, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_plasma(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_PLASMA), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_PLASMA, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_force(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_FORCE), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_FORCE, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
-    return TRUE;
-}
-
-static bool cast_blue_breath_mana(player_type *caster_ptr, blue_magic_type *bm_ptr)
-{
-    if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
-        return FALSE;
-
-    msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
-    bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_MANA), bm_ptr->plev, DAM_ROLL);
-    fire_breath(caster_ptr, GF_MANA, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
+    bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_SHOOT), bmc_ptr->plev, DAM_ROLL);
+    fire_bolt(caster_ptr, GF_ARROW, bmc_ptr->dir, bmc_ptr->damage);
     return TRUE;
 }
 
@@ -296,8 +77,8 @@ static bool cast_blue_breath_mana(player_type *caster_ptr, blue_magic_type *bm_p
  */
 bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
 {
-    blue_magic_type tmp_bm;
-    blue_magic_type *bm_ptr = initialize_blue_magic_type(caster_ptr, &tmp_bm, success, get_pseudo_monstetr_level);
+    bmc_type tmp_bm;
+    bmc_type *bmc_ptr = initialize_blue_magic_type(caster_ptr, &tmp_bm, success, get_pseudo_monstetr_level);
     floor_type *floor_ptr = caster_ptr->current_floor_ptr;
     switch (spell) {
     case MS_SHRIEK:
@@ -315,402 +96,402 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
 
         break;
     case MS_ROCKET:
-        if (!cast_blue_rocket(caster_ptr, bm_ptr))
+        if (!cast_blue_rocket(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_SHOOT:
-        if (!cast_blue_shoot(caster_ptr, bm_ptr))
+        if (!cast_blue_shoot(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_ACID:
-        if (!cast_blue_breath_acid(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_acid(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_ELEC:
-        if (!cast_blue_breath_elec(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_elec(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_FIRE:
-        if (!cast_blue_breath_fire(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_fire(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_COLD:
-        if (!cast_blue_breath_cold(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_cold(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_POIS:
-        if (!cast_blue_breath_pois(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_pois(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_NETHER:
-        if (!cast_blue_breath_nether(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_nether(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_LITE:
-        if (!cast_blue_breath_lite(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_lite(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_DARK:
-        if (!cast_blue_breath_dark(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_dark(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_CONF:
-        if (!cast_blue_breath_conf(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_conf(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_SOUND:
-        if (!cast_blue_breath_sound(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_sound(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_CHAOS:
-        if (!cast_blue_breath_chaos(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_chaos(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_DISEN:
-        if (!cast_blue_breath_disenchant(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_disenchant(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_NEXUS:
-        if (!cast_blue_breath_nexus(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_nexus(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_TIME:
-        if (!cast_blue_breath_time(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_time(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_INERTIA:
-        if (!cast_blue_breath_inertia(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_inertia(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_GRAVITY:
-        if (!cast_blue_breath_gravity(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_gravity(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_SHARDS:
-        if (!cast_blue_breath_shards(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_shards(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_PLASMA:
-        if (!cast_blue_breath_plasma(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_plasma(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_FORCE:
-        if (!cast_blue_breath_force(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_force(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BR_MANA:
-        if (!cast_blue_breath_mana(caster_ptr, bm_ptr))
+        if (!cast_blue_breath_mana(caster_ptr, bmc_ptr))
             return FALSE;
 
         break;
     case MS_BALL_NUKE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("放射能球を放った。", "You cast a ball of radiation."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_NUKE), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_NUKE, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_NUKE), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_NUKE, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BR_NUKE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_NUKE), bm_ptr->plev, DAM_ROLL);
-        fire_breath(caster_ptr, GF_NUKE, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_NUKE), bmc_ptr->plev, DAM_ROLL);
+        fire_breath(caster_ptr, GF_NUKE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
         break;
     case MS_BALL_CHAOS:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("純ログルスを放った。", "You invoke a raw Logrus."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_CHAOS), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_CHAOS, bm_ptr->dir, bm_ptr->damage, 4);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_CHAOS), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_CHAOS, bmc_ptr->dir, bmc_ptr->damage, 4);
         break;
     case MS_BR_DISI:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("分解のブレスを吐いた。", "You breathe disintegration."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_DISI), bm_ptr->plev, DAM_ROLL);
-        fire_breath(caster_ptr, GF_DISINTEGRATE, bm_ptr->dir, bm_ptr->damage, (bm_ptr->plev > 40 ? 3 : 2));
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BR_DISI), bmc_ptr->plev, DAM_ROLL);
+        fire_breath(caster_ptr, GF_DISINTEGRATE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2));
         break;
     case MS_BALL_ACID:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("アシッド・ボールの呪文を唱えた。", "You cast an acid ball."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_ACID), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_ACID, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_ACID), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_ELEC:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("サンダー・ボールの呪文を唱えた。", "You cast a lightning ball."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_ELEC), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_ELEC, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_ELEC), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_FIRE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("ファイア・ボールの呪文を唱えた。", "You cast a fire ball."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_FIRE), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_FIRE, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_FIRE), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_COLD:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("アイス・ボールの呪文を唱えた。", "You cast a frost ball."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_COLD), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_COLD, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_COLD), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_POIS:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("悪臭雲の呪文を唱えた。", "You cast a stinking cloud."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_POIS), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_POIS, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_POIS), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_POIS, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_NETHER:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("地獄球の呪文を唱えた。", "You cast a nether ball."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_NETHER), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_NETHER, bm_ptr->dir, bm_ptr->damage, 2);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_NETHER), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage, 2);
         break;
     case MS_BALL_WATER:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("流れるような身振りをした。", "You gesture fluidly."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_WATER), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_WATER, bm_ptr->dir, bm_ptr->damage, 4);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_WATER), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_WATER, bmc_ptr->dir, bmc_ptr->damage, 4);
         break;
     case MS_BALL_MANA:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("魔力の嵐の呪文を念じた。", "You invoke a mana storm."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_MANA), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_MANA, bm_ptr->dir, bm_ptr->damage, 4);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_MANA), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage, 4);
         break;
     case MS_BALL_DARK:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("暗黒の嵐の呪文を念じた。", "You invoke a darkness storm."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_DARK), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_DARK, bm_ptr->dir, bm_ptr->damage, 4);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BALL_DARK), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_DARK, bmc_ptr->dir, bmc_ptr->damage, 4);
         break;
     case MS_DRAIN_MANA:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_DRAIN_MANA), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_DRAIN_MANA, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_DRAIN_MANA), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_DRAIN_MANA, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_MIND_BLAST:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_MIND_BLAST), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_MIND_BLAST, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_MIND_BLAST), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_MIND_BLAST, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_BRAIN_SMASH:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BRAIN_SMASH), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_BRAIN_SMASH, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BRAIN_SMASH), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_BRAIN_SMASH, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_CAUSE_1:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_1), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_CAUSE_1, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_1), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_CAUSE_1, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_CAUSE_2:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_2), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_CAUSE_2, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_2), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_CAUSE_2, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_CAUSE_3:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_3), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_CAUSE_3, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_3), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_CAUSE_3, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_CAUSE_4:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_4), bm_ptr->plev, DAM_ROLL);
-        fire_ball_hide(caster_ptr, GF_CAUSE_4, bm_ptr->dir, bm_ptr->damage, 0);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_CAUSE_4), bmc_ptr->plev, DAM_ROLL);
+        fire_ball_hide(caster_ptr, GF_CAUSE_4, bmc_ptr->dir, bmc_ptr->damage, 0);
         break;
     case MS_BOLT_ACID:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("アシッド・ボルトの呪文を唱えた。", "You cast an acid bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ACID), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_ACID, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ACID), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_ELEC:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("サンダー・ボルトの呪文を唱えた。", "You cast a lightning bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ELEC), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_ELEC, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ELEC), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_FIRE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("ファイア・ボルトの呪文を唱えた。", "You cast a fire bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_FIRE), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_FIRE, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_FIRE), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_COLD:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("アイス・ボルトの呪文を唱えた。", "You cast a frost bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_COLD), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_COLD, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_COLD), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_STARBURST:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("スターバーストの呪文を念じた。", "You invoke a starburst."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_STARBURST), bm_ptr->plev, DAM_ROLL);
-        fire_ball(caster_ptr, GF_LITE, bm_ptr->dir, bm_ptr->damage, 4);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_STARBURST), bmc_ptr->plev, DAM_ROLL);
+        fire_ball(caster_ptr, GF_LITE, bmc_ptr->dir, bmc_ptr->damage, 4);
         break;
     case MS_BOLT_NETHER:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("地獄の矢の呪文を唱えた。", "You cast a nether bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_NETHER), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_NETHER, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_NETHER), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_WATER:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("ウォーター・ボルトの呪文を唱えた。", "You cast a water bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_WATER), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_WATER, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_WATER), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_WATER, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_MANA:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("魔力の矢の呪文を唱えた。", "You cast a mana bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_MANA), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_MANA, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_MANA), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_PLASMA:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("プラズマ・ボルトの呪文を唱えた。", "You cast a plasma bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_PLASMA), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_PLASMA, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_PLASMA), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_PLASMA, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_BOLT_ICE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("極寒の矢の呪文を唱えた。", "You cast a ice bolt."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ICE), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_ICE, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_BOLT_ICE), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_ICE, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_MAGIC_MISSILE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("マジック・ミサイルの呪文を唱えた。", "You cast a magic missile."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_MAGIC_MISSILE), bm_ptr->plev, DAM_ROLL);
-        fire_bolt(caster_ptr, GF_MISSILE, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_MAGIC_MISSILE), bmc_ptr->plev, DAM_ROLL);
+        fire_bolt(caster_ptr, GF_MISSILE, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_SCARE:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("恐ろしげな幻覚を作り出した。", "You cast a fearful illusion."));
-        fear_monster(caster_ptr, bm_ptr->dir, bm_ptr->plev + 10);
+        fear_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev + 10);
         break;
     case MS_BLIND:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        confuse_monster(caster_ptr, bm_ptr->dir, bm_ptr->plev * 2);
+        confuse_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev * 2);
         break;
     case MS_CONF:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("誘惑的な幻覚をつくり出した。", "You cast a mesmerizing illusion."));
-        confuse_monster(caster_ptr, bm_ptr->dir, bm_ptr->plev * 2);
+        confuse_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev * 2);
         break;
     case MS_SLOW:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        slow_monster(caster_ptr, bm_ptr->dir, bm_ptr->plev);
+        slow_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev);
         break;
     case MS_SLEEP:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        sleep_monster(caster_ptr, bm_ptr->dir, bm_ptr->plev);
+        sleep_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev);
         break;
     case MS_SPEED:
-        (void)set_fast(caster_ptr, randint1(20 + bm_ptr->plev) + bm_ptr->plev, FALSE);
+        (void)set_fast(caster_ptr, randint1(20 + bmc_ptr->plev) + bmc_ptr->plev, FALSE);
         break;
     case MS_HAND_DOOM: {
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("<破滅の手>を放った！", "You invoke the Hand of Doom!"));
-        fire_ball_hide(caster_ptr, GF_HAND_DOOM, bm_ptr->dir, bm_ptr->plev * 3, 0);
+        fire_ball_hide(caster_ptr, GF_HAND_DOOM, bmc_ptr->dir, bmc_ptr->plev * 3, 0);
         break;
     }
     case MS_HEAL:
         msg_print(_("自分の傷に念を集中した。", "You concentrate on your wounds!"));
-        (void)hp_player(caster_ptr, bm_ptr->plev * 4);
+        (void)hp_player(caster_ptr, bmc_ptr->plev * 4);
         (void)set_stun(caster_ptr, 0);
         (void)set_cut(caster_ptr, 0);
         break;
@@ -722,7 +503,7 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
         teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
         break;
     case MS_TELEPORT:
-        teleport_player(caster_ptr, bm_ptr->plev * 5, TELEPORT_SPONTANEOUS);
+        teleport_player(caster_ptr, bmc_ptr->plev * 5, TELEPORT_SPONTANEOUS);
         break;
     case MS_WORLD:
         (void)time_walk(caster_ptr);
@@ -768,21 +549,21 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
         break;
     }
     case MS_TELE_AWAY:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
-        (void)fire_beam(caster_ptr, GF_AWAY_ALL, bm_ptr->dir, 100);
+        (void)fire_beam(caster_ptr, GF_AWAY_ALL, bmc_ptr->dir, 100);
         break;
     case MS_TELE_LEVEL:
         return teleport_level_other(caster_ptr);
         break;
     case MS_PSY_SPEAR:
-        if (!get_aim_dir(caster_ptr, &bm_ptr->dir))
+        if (!get_aim_dir(caster_ptr, &bmc_ptr->dir))
             return FALSE;
 
         msg_print(_("光の剣を放った。", "You throw a psycho-spear."));
-        bm_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_PSY_SPEAR), bm_ptr->plev, DAM_ROLL);
-        (void)fire_beam(caster_ptr, GF_PSY_SPEAR, bm_ptr->dir, bm_ptr->damage);
+        bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, (MS_PSY_SPEAR), bmc_ptr->plev, DAM_ROLL);
+        (void)fire_beam(caster_ptr, GF_PSY_SPEAR, bmc_ptr->dir, bmc_ptr->damage);
         break;
     case MS_DARKNESS:
 
@@ -806,11 +587,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_KIN: {
         msg_print(_("援軍を召喚した。", "You summon one of your kin."));
         for (int k = 0; k < 1; k++) {
-            if (summon_kin_player(caster_ptr, bm_ptr->summon_lev, caster_ptr->y, caster_ptr->x, (bm_ptr->pet ? PM_FORCE_PET : 0L))) {
-                if (!bm_ptr->pet)
+            if (summon_kin_player(caster_ptr, bmc_ptr->summon_lev, caster_ptr->y, caster_ptr->x, (bmc_ptr->pet ? PM_FORCE_PET : 0L))) {
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚された仲間は怒っている！", "The summoned companion is angry!"));
             } else {
-                bm_ptr->no_trump = TRUE;
+                bmc_ptr->no_trump = TRUE;
             }
         }
 
@@ -819,11 +600,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_CYBER: {
         msg_print(_("サイバーデーモンを召喚した！", "You summon a Cyberdemon!"));
         for (int k = 0; k < 1; k++) {
-            if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_CYBER, bm_ptr->p_mode)) {
-                if (!bm_ptr->pet)
+            if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_CYBER, bmc_ptr->p_mode)) {
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚されたサイバーデーモンは怒っている！", "The summoned Cyberdemon are angry!"));
             } else {
-                bm_ptr->no_trump = TRUE;
+                bmc_ptr->no_trump = TRUE;
             }
         }
 
@@ -832,11 +613,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_MONSTER: {
         msg_print(_("仲間を召喚した。", "You summon help."));
         for (int k = 0; k < 1; k++) {
-            if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, 0, bm_ptr->p_mode)) {
-                if (!bm_ptr->pet)
+            if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, 0, bmc_ptr->p_mode)) {
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚されたモンスターは怒っている！", "The summoned monster is angry!"));
             } else {
-                bm_ptr->no_trump = TRUE;
+                bmc_ptr->no_trump = TRUE;
             }
         }
 
@@ -844,12 +625,12 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     }
     case MS_S_MONSTERS: {
         msg_print(_("モンスターを召喚した！", "You summon monsters!"));
-        for (int k = 0; k < bm_ptr->plev / 15 + 2; k++) {
-            if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, 0, (bm_ptr->p_mode | bm_ptr->u_mode))) {
-                if (!bm_ptr->pet)
+        for (int k = 0; k < bmc_ptr->plev / 15 + 2; k++) {
+            if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, 0, (bmc_ptr->p_mode | bmc_ptr->u_mode))) {
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚されたモンスターは怒っている！", "The summoned monsters are angry!"));
             } else {
-                bm_ptr->no_trump = TRUE;
+                bmc_ptr->no_trump = TRUE;
             }
         }
 
@@ -858,11 +639,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_ANT: {
         msg_print(_("アリを召喚した。", "You summon ants."));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_ANT, (PM_ALLOW_GROUP | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_ANT, (PM_ALLOW_GROUP | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたアリは怒っている！", "The summoned ants are angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -870,11 +651,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_SPIDER: {
         msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_SPIDER, (PM_ALLOW_GROUP | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_SPIDER, (PM_ALLOW_GROUP | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚された蜘蛛は怒っている！", "Summoned spiders are angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -882,11 +663,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_HOUND: {
         msg_print(_("ハウンドを召喚した。", "You summon hounds."));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_HOUND, (PM_ALLOW_GROUP | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_HOUND, (PM_ALLOW_GROUP | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたハウンドは怒っている！", "Summoned hounds are angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -894,11 +675,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_HYDRA: {
         msg_print(_("ヒドラを召喚した。", "You summon a hydras."));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_HYDRA, (bm_ptr->g_mode | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_HYDRA, (bmc_ptr->g_mode | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたヒドラは怒っている！", "Summoned hydras are angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -906,11 +687,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_ANGEL: {
         msg_print(_("天使を召喚した！", "You summon an angel!"));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_ANGEL, (bm_ptr->g_mode | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_ANGEL, (bmc_ptr->g_mode | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚された天使は怒っている！", "The summoned angel is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -918,11 +699,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_DEMON: {
         msg_print(_("混沌の宮廷から悪魔を召喚した！", "You summon a demon from the Courts of Chaos!"));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_DEMON, (bm_ptr->g_mode | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_DEMON, (bmc_ptr->g_mode | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたデーモンは怒っている！", "The summoned demon is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -930,11 +711,11 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_UNDEAD: {
         msg_print(_("アンデッドの強敵を召喚した！", "You summon an undead adversary!"));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_UNDEAD, (bm_ptr->g_mode | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_UNDEAD, (bmc_ptr->g_mode | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたアンデッドは怒っている！", "The summoned undead is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -942,47 +723,47 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
     case MS_S_DRAGON: {
         msg_print(_("ドラゴンを召喚した！", "You summon a dragon!"));
         if (summon_specific(
-                caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_DRAGON, (bm_ptr->g_mode | bm_ptr->p_mode))) {
-            if (!bm_ptr->pet)
+                caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_DRAGON, (bmc_ptr->g_mode | bmc_ptr->p_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたドラゴンは怒っている！", "The summoned dragon is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
     }
     case MS_S_HI_UNDEAD: {
         msg_print(_("強力なアンデッドを召喚した！", "You summon a greater undead!"));
-        if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_HI_UNDEAD,
-                (bm_ptr->g_mode | bm_ptr->p_mode | bm_ptr->u_mode))) {
-            if (!bm_ptr->pet)
+        if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_HI_UNDEAD,
+                (bmc_ptr->g_mode | bmc_ptr->p_mode | bmc_ptr->u_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚された上級アンデッドは怒っている！", "The summoned greater undead is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
     }
     case MS_S_HI_DRAGON: {
         msg_print(_("古代ドラゴンを召喚した！", "You summon an ancient dragon!"));
-        if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_HI_DRAGON,
-                (bm_ptr->g_mode | bm_ptr->p_mode | bm_ptr->u_mode))) {
-            if (!bm_ptr->pet)
+        if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_HI_DRAGON,
+                (bmc_ptr->g_mode | bmc_ptr->p_mode | bmc_ptr->u_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚された古代ドラゴンは怒っている！", "The summoned ancient dragon is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
     }
     case MS_S_AMBERITE: {
         msg_print(_("アンバーの王族を召喚した！", "You summon a Lord of Amber!"));
-        if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_AMBERITES,
-                (bm_ptr->g_mode | bm_ptr->p_mode | bm_ptr->u_mode))) {
-            if (!bm_ptr->pet)
+        if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_AMBERITES,
+                (bmc_ptr->g_mode | bmc_ptr->p_mode | bmc_ptr->u_mode))) {
+            if (!bmc_ptr->pet)
                 msg_print(_("召喚されたアンバーの王族は怒っている！", "The summoned Lord of Amber is angry!"));
         } else {
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
         }
 
         break;
@@ -991,25 +772,25 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
         int count = 0;
         msg_print(_("特別な強敵を召喚した！", "You summon a special opponent!"));
         for (int k = 0; k < 1; k++) {
-            if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_UNIQUE,
-                    (bm_ptr->g_mode | bm_ptr->p_mode | PM_ALLOW_UNIQUE))) {
+            if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_UNIQUE,
+                    (bmc_ptr->g_mode | bmc_ptr->p_mode | PM_ALLOW_UNIQUE))) {
                 count++;
-                if (!bm_ptr->pet)
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚されたユニーク・モンスターは怒っている！", "The summoned special opponent is angry!"));
             }
         }
 
         for (int k = count; k < 1; k++) {
-            if (summon_specific(caster_ptr, (bm_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bm_ptr->summon_lev, SUMMON_HI_UNDEAD,
-                    (bm_ptr->g_mode | bm_ptr->p_mode | PM_ALLOW_UNIQUE))) {
+            if (summon_specific(caster_ptr, (bmc_ptr->pet ? -1 : 0), caster_ptr->y, caster_ptr->x, bmc_ptr->summon_lev, SUMMON_HI_UNDEAD,
+                    (bmc_ptr->g_mode | bmc_ptr->p_mode | PM_ALLOW_UNIQUE))) {
                 count++;
-                if (!bm_ptr->pet)
+                if (!bmc_ptr->pet)
                     msg_print(_("召喚された上級アンデッドは怒っている！", "The summoned greater undead is angry!"));
             }
         }
 
         if (!count)
-            bm_ptr->no_trump = TRUE;
+            bmc_ptr->no_trump = TRUE;
 
         break;
     }
@@ -1017,7 +798,7 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
         msg_print("hoge?");
     }
 
-    if (bm_ptr->no_trump)
+    if (bmc_ptr->no_trump)
         msg_print(_("何も現れなかった。", "No one appeared."));
 
     return TRUE;

diff --git a/src/blue-magic/blue-magic-checker.c b/src/blue-magic/blue-magic-checker.c
index 2403595..f698ee1 100644 (file)
--- a/src/blue-magic/blue-magic-checker.c
+++ b/src/blue-magic/blue-magic-checker.c
@@ -60,7 +60,7 @@ void learn_spell(player_type *learner_ptr, int monspell)
  */
 /*
  */
-void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode)
+void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, blue_magic_type mode)
 {
     switch (mode) {
     case MONSPELL_TYPE_BOLT:

diff --git a/src/blue-magic/blue-magic-checker.h b/src/blue-magic/blue-magic-checker.h
index 5047cc4..1604b4d 100644 (file)
--- a/src/blue-magic/blue-magic-checker.h
+++ b/src/blue-magic/blue-magic-checker.h
@@ -2,5 +2,6 @@
 
 #include "system/angband.h"
 
+typedef enum blue_magic_type blue_magic_type;
 void learn_spell(player_type *learner_ptr, int monspell);
-void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode);
+void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, blue_magic_type mode);

diff --git a/src/blue-magic/blue-magic-util.c b/src/blue-magic/blue-magic-util.c
index 70885fc..8ec36df 100644 (file)
--- a/src/blue-magic/blue-magic-util.c
+++ b/src/blue-magic/blue-magic-util.c
@@ -1,19 +1,19 @@
 #include "blue-magic/blue-magic-util.h"
 #include "monster-floor/place-monster-types.h"
 
-blue_magic_type *initialize_blue_magic_type(
-    player_type *caster_ptr, blue_magic_type *bm_ptr, const bool success, get_pseudo_monstetr_level_pf get_pseudo_monstetr_level)
+bmc_type *initialize_blue_magic_type(
+    player_type *caster_ptr, bmc_type *bmc_ptr, const bool success, get_pseudo_monstetr_level_pf get_pseudo_monstetr_level)
 {
-    bm_ptr->plev = (*get_pseudo_monstetr_level)(caster_ptr);
-    bm_ptr->summon_lev = caster_ptr->lev * 2 / 3 + randint1(caster_ptr->lev / 2);
-    bm_ptr->damage = 0;
-    bm_ptr->pet = success; // read-only.
-    bm_ptr->no_trump = FALSE;
-    bm_ptr->p_mode = bm_ptr->pet ? PM_FORCE_PET : PM_NO_PET;
-    bm_ptr->u_mode = 0L;
-    bm_ptr->g_mode = bm_ptr->pet ? 0 : PM_ALLOW_GROUP;
-    if (!success || (randint1(50 + bm_ptr->plev) < bm_ptr->plev / 10))
-        bm_ptr->u_mode = PM_ALLOW_UNIQUE;
+    bmc_ptr->plev = (*get_pseudo_monstetr_level)(caster_ptr);
+    bmc_ptr->summon_lev = caster_ptr->lev * 2 / 3 + randint1(caster_ptr->lev / 2);
+    bmc_ptr->damage = 0;
+    bmc_ptr->pet = success; // read-only.
+    bmc_ptr->no_trump = FALSE;
+    bmc_ptr->p_mode = bmc_ptr->pet ? PM_FORCE_PET : PM_NO_PET;
+    bmc_ptr->u_mode = 0L;
+    bmc_ptr->g_mode = bmc_ptr->pet ? 0 : PM_ALLOW_GROUP;
+    if (!success || (randint1(50 + bmc_ptr->plev) < bmc_ptr->plev / 10))
+        bmc_ptr->u_mode = PM_ALLOW_UNIQUE;
 
-    return bm_ptr;
+    return bmc_ptr;
 }

diff --git a/src/blue-magic/blue-magic-util.h b/src/blue-magic/blue-magic-util.h
index 98cd688..c1142ae 100644 (file)
--- a/src/blue-magic/blue-magic-util.h
+++ b/src/blue-magic/blue-magic-util.h
@@ -2,7 +2,8 @@
 
 #include "system/angband.h"
 
-typedef struct blue_magic_type {
+// Blue Magic Cast.
+typedef struct bmc_type {
     DIRECTION dir;
     PLAYER_LEVEL plev;
     PLAYER_LEVEL summon_lev;
@@ -12,8 +13,8 @@ typedef struct blue_magic_type {
     BIT_FLAGS p_mode;
     BIT_FLAGS u_mode;
     BIT_FLAGS g_mode;
-} blue_magic_type;
+} bmc_type;
 
 typedef PLAYER_LEVEL (*get_pseudo_monstetr_level_pf)(player_type *caster_ptr);
-blue_magic_type *initialize_blue_magic_type(
-    player_type *caster_ptr, blue_magic_type *bm_ptr, const bool success, get_pseudo_monstetr_level_pf get_pseudo_monstetr_level);
+bmc_type *initialize_blue_magic_type(
+    player_type *caster_ptr, bmc_type *bmc_ptr, const bool success, get_pseudo_monstetr_level_pf get_pseudo_monstetr_level);

diff --git a/src/io-dump/special-class-dump.c b/src/io-dump/special-class-dump.c
index b42dcb8..293f4f4 100644 (file)
--- a/src/io-dump/special-class-dump.c
+++ b/src/io-dump/special-class-dump.c
@@ -119,7 +119,7 @@ static void dump_smith(player_type *creature_ptr, FILE *fff)
  * @param learnt_spell_ptr 学習済魔法のテーブル
  * @return なし
  */
-static void add_monster_spell_type(char p[][80], int col, int spell_type, learnt_spell_table *learnt_spell_ptr)
+static void add_monster_spell_type(char p[][80], int col, blue_magic_type spell_type, learnt_spell_table *learnt_spell_ptr)
 {
     learnt_spell_ptr->f4 = 0;
     learnt_spell_ptr->f5 = 0;