[Refactor] #40478 Divided monster-spells.h to mspells1.h, mspells2.h and mspells3.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index edf6d7a..a643418 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -596,6 +596,9 @@
     <ClInclude Include="..\..\src\mind\mind-blue-mage.h" />\r
     <ClInclude Include="..\..\src\mspell\monster-power-table.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-mask-definitions.h" />\r
+    <ClInclude Include="..\..\src\mspell\mspells1.h" />\r
+    <ClInclude Include="..\..\src\mspell\mspells2.h" />\r
+    <ClInclude Include="..\..\src\mspell\mspells3.h" />\r
     <ClInclude Include="..\..\src\system\alloc-entries.h" />\r
     <ClInclude Include="..\..\src\term\screen-processor.h" />\r
     <ClInclude Include="..\..\src\util\bit-flags-calculator.h" />\r
@@ -1104,7 +1107,6 @@
     <ClInclude Include="..\..\src\io\load.h" />\r
     <ClInclude Include="..\..\src\mind\mind.h" />\r
     <ClInclude Include="..\..\src\monster\monster-processor.h" />\r
-    <ClInclude Include="..\..\src\mspell\monster-spell.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
     <ClInclude Include="..\..\src\system\monster-type-definition.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-race-hook.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 2a1a8d3..5ab95d8 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2035,9 +2035,6 @@
     <ClInclude Include="..\..\src\core\scores.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mspell\monster-spell.h">
-      <Filter>mspell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mspell\mspell-bolt.h">
       <Filter>mspell</Filter>
     </ClInclude>
@@ -3085,6 +3082,15 @@
     <ClInclude Include="..\..\src\mspell\monster-power-table.h">
       <Filter>mspell</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\mspell\mspells1.h">
+      <Filter>mspell</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\mspell\mspells2.h">
+      <Filter>mspell</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\mspell\mspells3.h">
+      <Filter>mspell</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 90b0595..4ccc18d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -362,8 +362,10 @@ hengband_SOURCES = \
        monster-race/race-indice-types.h \
        \
        mspell/assign-monster-spell.c mspell/assign-monster-spell.h \
-       mspell/monster-power-table.c mspell/monster-spell.h \
-       mspell/mspells1.c mspell/mspells2.c mspell/mspells3.c \
+       mspell/monster-power-table.c mspell/monster-power-table..h \
+       mspell/mspells1.c mspell/mspells1.h \
+       mspell/mspells2.c mspell/mspells2.h \
+       mspell/mspells3.c mspell/mspells3.h \
        mspell/mspell-summon.c mspell/mspell-summon.h \
        mspell/mspell-util.c mspell/mspell-util.h \
        mspell/mspell-curse.c mspell/mspell-curse.h \

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 8a22d97..33ce717 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -26,7 +26,6 @@
 #include "monster/monster-info.h"
 #include "monster-floor/monster-move.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-broken.h"

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index dfba5f0..5bc66fb 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -9,7 +9,6 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "player/player-effects.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c
index bb47c0e..f6926db 100644 (file)
--- a/src/effect/effect-player-curse.c
+++ b/src/effect/effect-player-curse.c
@@ -1,7 +1,7 @@
 #include "effect/effect-player-curse.h"
 #include "mind/mind-mirror-master.h"
 #include "monster-race/race-indice-types.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "object-enchant/object-curse.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 200be86..06ed6a3 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -3,7 +3,7 @@
 #include "inventory/inventory-damage.h"
 #include "mind/mind-mirror-master.h"
 #include "monster-race/race-indice-types.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "mutation/mutation.h"
 #include "object/object-broken.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index 6a572d2..f47bf0b 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -1,6 +1,6 @@
 #include "effect/effect-player-spirit.h"
 #include "mind/mind-mirror-master.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index 55e32f3..f4d9913 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -6,7 +6,7 @@
 #include "effect/effect-player-spirit.h"
 #include "inventory/inventory-damage.h"
 #include "mind/mind-mirror-master.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "object-enchant/object-curse.h"
 #include "object/object-broken.h"
 #include "player/mimic-info-table.h"

diff --git a/src/io-dump/special-class-dump.c b/src/io-dump/special-class-dump.c
index 0fff9d4..fa84e05 100644 (file)
--- a/src/io-dump/special-class-dump.c
+++ b/src/io-dump/special-class-dump.c
@@ -9,7 +9,7 @@
 #include "cmd-item/cmd-smith.h"
 #include "mind/mind-blue-mage.h"
 #include "mspell/monster-power-table.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 3f752d1..24c25b8 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -59,7 +59,7 @@
 #include "mind/mind.h" // do_cmd_mind_browse() がある。後で移設する.
 #include "mind/racial.h" // do_cmd_racial_power() がある。ファイル名変更？.
 #include "mind/snipe-types.h"
-#include "mspell/monster-spell.h" // do_cmd_cast_learned() がある。後で移設する.
+#include "mspell/mspells3.h" // do_cmd_cast_learned() がある。後で移設する.
 #include "player/player-effects.h"
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
 #include "spell/spells-object.h"

diff --git a/src/lore/lore-calculator.c b/src/lore/lore-calculator.c
index ad6659a..371bdd5 100644 (file)
--- a/src/lore/lore-calculator.c
+++ b/src/lore/lore-calculator.c
@@ -2,7 +2,6 @@
 #include "game-option/cheat-options.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 
 /*!

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index f066d9f..9adea97 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -29,7 +29,6 @@
 #include "monster-floor/monster-move.h"
 #include "monster-floor/monster-remover.h"
 #include "monster/monster-status.h"
-#include "mspell/monster-spell.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-class.h"
 #include "player/player-move.h"

diff --git a/src/monster-floor/monster-safety-hiding.c b/src/monster-floor/monster-safety-hiding.c
index 60c7a2c..770620d 100644 (file)
--- a/src/monster-floor/monster-safety-hiding.c
+++ b/src/monster-floor/monster-safety-hiding.c
@@ -10,7 +10,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells1.h"
 
  /*!
   * @brief モンスターが逃げ込める地点を走査する

diff --git a/src/monster-floor/monster-sweep-grid.c b/src/monster-floor/monster-sweep-grid.c
index 86a8d87..5a9ecca 100644 (file)
--- a/src/monster-floor/monster-sweep-grid.c
+++ b/src/monster-floor/monster-sweep-grid.c
@@ -18,7 +18,6 @@
 #include "monster-floor/monster-safety-hiding.h"
 #include "monster/monster-status.h"
 #include "mspell/mspell-mask-definitions.h"
-#include "mspell/monster-spell.h"
 
  /*!
   * @brief モンスターがプレイヤーから逃走するかどうかを返す /

diff --git a/src/monster-floor/quantum-effect.c b/src/monster-floor/quantum-effect.c
index 2b4c134..9d869ed 100644 (file)
--- a/src/monster-floor/quantum-effect.c
+++ b/src/monster-floor/quantum-effect.c
@@ -1,15 +1,14 @@
 #include "monster-floor/quantum-effect.h"
 #include "floor/floor.h"
+#include "monster-floor/monster-death.h"
+#include "monster-floor/monster-remover.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
-#include "monster-floor/monster-death.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
-#include "monster-floor/monster-remover.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"
-#include "mspell/monster-spell.h"
 #include "spell-kind/spells-teleport.h"
 #include "view/display-messages.h"
 

diff --git a/src/monster-race/monster-race-hook.c b/src/monster-race/monster-race-hook.c
index 402f159..cc383e5 100644 (file)
--- a/src/monster-race/monster-race-hook.c
+++ b/src/monster-race/monster-race-hook.c
@@ -16,7 +16,6 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "util/string-processor.h"
 

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index c86f3e5..bfb2dff 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -45,7 +45,8 @@
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells1.h"
+#include "mspell/mspells2.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/avatar.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 53be99c..b52dae1 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -43,7 +43,6 @@
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "object-enchant/object-curse.h"
 #include "player/avatar.h"

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index 1b90aa4..3dd805e 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -12,7 +12,6 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/race-indice-types.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "spell/spells-summon.h"
 #include "system/alloc-entries.h"

diff --git a/src/mspell/assign-monster-spell.c b/src/mspell/assign-monster-spell.c
index 43f9cb4..e1627a2 100644 (file)
--- a/src/mspell/assign-monster-spell.c
+++ b/src/mspell/assign-monster-spell.c
@@ -5,7 +5,6 @@
  */
 
 #include "mspell/assign-monster-spell.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-ball.h"
 #include "mspell/mspell-bolt.h"
 #include "mspell/mspell-breath.h"

diff --git a/src/mspell/monster-spell.h b/src/mspell/monster-spell.h
deleted file mode 100644 (file)
index d818bf8..0000000
--- a/src/mspell/monster-spell.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "system/monster-type-definition.h"
-
-/* mspells1.c */
-extern bool clean_shot(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend);
-extern bool summon_possible(player_type *target_ptr, POSITION y1, POSITION x1);
-extern bool raise_possible(player_type *target_ptr, monster_type *m_ptr);
-extern bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx);
-extern bool spell_is_inate(SPELL_IDX spell);
-extern bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr);
-extern void beam(player_type *target_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
-extern void bolt(player_type *target_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
-extern void breath(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type);
-
-/* mspells2.c */
-extern void get_project_point(player_type *target_ptr, POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
-extern bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx);
-
-/* mspells3.c */
-extern bool do_cmd_cast_learned(player_type *caster_ptr);
-extern void learn_spell(player_type *learner_ptr, int monspell);
-extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode);

diff --git a/src/mspell/mspell-ball.c b/src/mspell/mspell-ball.c
index 05723e6..62d9893 100644 (file)
--- a/src/mspell/mspell-ball.c
+++ b/src/mspell/mspell-ball.c
@@ -6,7 +6,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells1.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"

diff --git a/src/mspell/mspell-bolt.c b/src/mspell/mspell-bolt.c
index 3cf34e7..7213bcf 100644 (file)
--- a/src/mspell/mspell-bolt.c
+++ b/src/mspell/mspell-bolt.c
@@ -4,10 +4,10 @@
 #include "mind/drs-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "spell/spell-types.h"
 
 /*!

diff --git a/src/mspell/mspell-breath.c b/src/mspell/mspell-breath.c
index ba8a7cc..96fc435 100644 (file)
--- a/src/mspell/mspell-breath.c
+++ b/src/mspell/mspell-breath.c
@@ -5,9 +5,9 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "player/player-move.h"
 #include "spell/spell-types.h"
 #include "view/display-messages.h"

diff --git a/src/mspell/mspell-curse.c b/src/mspell/mspell-curse.c
index 607e391..38d44f5 100644 (file)
--- a/src/mspell/mspell-curse.c
+++ b/src/mspell/mspell-curse.c
@@ -1,10 +1,10 @@
 #include "mspell/mspell-curse.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "player/player-move.h"
 #include "spell/spell-types.h"
 #include "view/display-messages.h"

diff --git a/src/mspell/mspell-damage-calculator.c b/src/mspell/mspell-damage-calculator.c
index cfbe36e..7e6080c 100644 (file)
--- a/src/mspell/mspell-damage-calculator.c
+++ b/src/mspell/mspell-damage-calculator.c
@@ -4,7 +4,6 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-status.h"
-#include "mspell/monster-spell.h"
 
 /*!
  * @brief モンスターの使う呪文の威力を決定する /

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index fbdfcf8..1596cd7 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -17,10 +17,10 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-status.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells3.h"
 #include "player/player-move.h"
 #include "player/player-personalities-types.h"
 #include "spell/process-effect.h"

diff --git a/src/mspell/mspell-particularity.c b/src/mspell/mspell-particularity.c
index a087aa5..d13c403 100644 (file)
--- a/src/mspell/mspell-particularity.c
+++ b/src/mspell/mspell-particularity.c
@@ -3,7 +3,7 @@
  * Performing special spells that take damage, not bolts, balls or breaths
  * @date 2020/05/16
  * @author Hourier
- * @details 肥大化しやすいファイル名なので、関数の追加時は共通部分を別ファイルに抜き出せるか検討すること / 
+ * @details 肥大化しやすいファイル名なので、関数の追加時は共通部分を別ファイルに抜き出せるか検討すること /
  * This is a filename that tends to be bloated.
  * So when adding a function, please consider whether you can extract the common part to another file.
  */
@@ -11,11 +11,11 @@
 #include "mspell/mspell-particularity.h"
 #include "mind/drs-types.h"
 #include "monster/monster-update.h"
+#include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
-#include "mspell/monster-spell.h"
-#include "spell/spell-types.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspell-damage-calculator.h"
+#include "mspell/mspells1.h"
+#include "spell/spell-types.h"
 
 /*!
  * @brief RF4_ROCKETの処理。ロケット。 /
@@ -27,15 +27,12 @@
  * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER
  * @return ダメージ量を返す。
  */
-HIT_POINT spell_RF4_ROCKET(player_type* target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
+HIT_POINT spell_RF4_ROCKET(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
     HIT_POINT dam;
 
-    monspell_message(target_ptr, m_idx, t_idx,
-        _("%^sが何かを射った。", "%^s shoots something."),
-        _("%^sがロケットを発射した。", "%^s fires a rocket."),
-        _("%^sが%sにロケットを発射した。", "%^s fires a rocket at %s."),
-        TARGET_TYPE);
+    monspell_message(target_ptr, m_idx, t_idx, _("%^sが何かを射った。", "%^s shoots something."), _("%^sがロケットを発射した。", "%^s fires a rocket."),
+        _("%^sが%sにロケットを発射した。", "%^s fires a rocket at %s."), TARGET_TYPE);
 
     dam = monspell_damage(target_ptr, (MS_ROCKET), m_idx, DAM_ROLL);
     breath(target_ptr, y, x, m_idx, GF_ROCKET, dam, 2, FALSE, MS_ROCKET, TARGET_TYPE);
@@ -54,12 +51,10 @@ HIT_POINT spell_RF4_ROCKET(player_type* target_ptr, POSITION y, POSITION x, MONS
  * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER
  * @return ダメージ量を返す。
  */
-HIT_POINT spell_RF6_HAND_DOOM(player_type* target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
+HIT_POINT spell_RF6_HAND_DOOM(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
-    simple_monspell_message(target_ptr, m_idx, t_idx,
-        _("%^sが<破滅の手>を放った！", "%^s invokes the Hand of Doom!"),
-        _("%^sが%sに<破滅の手>を放った！", "%^s invokes the Hand of Doom upon %s!"),
-        TARGET_TYPE);
+    simple_monspell_message(target_ptr, m_idx, t_idx, _("%^sが<破滅の手>を放った！", "%^s invokes the Hand of Doom!"),
+        _("%^sが%sに<破滅の手>を放った！", "%^s invokes the Hand of Doom upon %s!"), TARGET_TYPE);
 
     HIT_POINT dam = 0;
     if (TARGET_TYPE == MONSTER_TO_PLAYER) {
@@ -82,13 +77,10 @@ HIT_POINT spell_RF6_HAND_DOOM(player_type* target_ptr, POSITION y, POSITION x, M
  * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER
  * @return ダメージ量を返す。
  */
-HIT_POINT spell_RF6_PSY_SPEAR(player_type* target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
+HIT_POINT spell_RF6_PSY_SPEAR(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
-    monspell_message(target_ptr, m_idx, t_idx,
-        _("%^sが何かをつぶやいた。", "%^s mumbles."),
-        _("%^sが光の剣を放った。", "%^s throw a Psycho-Spear."),
-        _("%^sが%sに向かって光の剣を放った。", "%^s throw a Psycho-spear at %s."),
-        TARGET_TYPE);
+    monspell_message(target_ptr, m_idx, t_idx, _("%^sが何かをつぶやいた。", "%^s mumbles."), _("%^sが光の剣を放った。", "%^s throw a Psycho-Spear."),
+        _("%^sが%sに向かって光の剣を放った。", "%^s throw a Psycho-spear at %s."), TARGET_TYPE);
 
     HIT_POINT dam = monspell_damage(target_ptr, (MS_PSY_SPEAR), m_idx, DAM_ROLL);
     beam(target_ptr, m_idx, y, x, GF_PSY_SPEAR, dam, MS_PSY_SPEAR, MONSTER_TO_PLAYER);

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index 0226d0a..1956877 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -19,8 +19,8 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-util.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index 784feac..cb0b4e4 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -16,9 +16,10 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
+#include "mspell/mspells3.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-personalities-types.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 6bf4100..65aa0da 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -10,8 +10,8 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "player/player-move.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/process-effect.h"

diff --git a/src/mspell/mspell-util.c b/src/mspell/mspell-util.c
index 3b92638..dfb2251 100644 (file)
--- a/src/mspell/mspell-util.c
+++ b/src/mspell/mspell-util.c
@@ -1,6 +1,5 @@
 #include "mspell/mspell-util.h"
 #include "monster/monster-info.h"
-#include "mspell/monster-spell.h"
 #include "player/player-move.h"
 #include "view/display-messages.h"
 

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index 4572f71..6688a1a 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -9,12 +9,13 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "system/angband.h"
+#include "mspell/mspells1.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"
+#include "monster-floor/monster-move.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
@@ -29,14 +30,14 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
-#include "monster-floor/monster-move.h"
 #include "monster/monster-status.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-learn-checker.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells2.h"
+#include "mspell/mspells3.h"
 #include "object-enchant/object-curse.h"
 #include "player/player-class.h"
 #include "player/player-move.h"

diff --git a/src/mspell/mspells1.h b/src/mspell/mspells1.h
new file mode 100644 (file)
index 0000000..fc84149
--- /dev/null
+++ b/src/mspell/mspells1.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "system/angband.h"
+#include "system/monster-type-definition.h"
+
+bool clean_shot(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend);
+bool summon_possible(player_type *target_ptr, POSITION y1, POSITION x1);
+bool raise_possible(player_type *target_ptr, monster_type *m_ptr);
+bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx);
+bool spell_is_inate(SPELL_IDX spell);
+bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr);
+void beam(player_type *target_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
+void bolt(player_type *target_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
+void breath(
+    player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type);

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index fe9e908..b462e35 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -9,13 +9,14 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "system/angband.h"
+#include "mspell/mspells2.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
+#include "monster-floor/monster-move.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
@@ -27,12 +28,11 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
-#include "monster-floor/monster-move.h"
 #include "monster/monster-status.h"
 #include "mspell/assign-monster-spell.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "mspell/mspell-util.h"
+#include "mspell/mspells1.h"
 #include "pet/pet-util.h"
 #include "player/player-class.h"
 #include "player/player-move.h"

diff --git a/src/mspell/mspells2.h b/src/mspell/mspells2.h
new file mode 100644 (file)
index 0000000..fa2021b
--- /dev/null
+++ b/src/mspell/mspells2.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "system/angband.h"
+
+void get_project_point(player_type *target_ptr, POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
+bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx);

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index 387f7cd..6bfa583 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -9,7 +9,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "system/angband.h"
+#include "mspell/mspells3.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
@@ -39,7 +39,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "mspell/monster-power-table.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "mspell/mspell-type.h"
@@ -52,9 +51,9 @@
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"
 #include "spell-kind/spells-teleport.h"
+#include "spell/spell-types.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spell-types.h"
 #include "spell/spells3.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"

diff --git a/src/mspell/mspells3.h b/src/mspell/mspells3.h
new file mode 100644 (file)
index 0000000..dda2b30
--- /dev/null
+++ b/src/mspell/mspells3.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "system/angband.h"
+
+bool do_cmd_cast_learned(player_type *caster_ptr);
+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);

diff --git a/src/object/warning.c b/src/object/warning.c
index 924fc3b..72b30be 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -15,7 +15,6 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 36b15e1..a657289 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -24,13 +24,13 @@
 #include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
 #include "mind/mind-mirror-master.h"
-#include "monster/monster-describer.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
+#include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-broken.h"
 #include "object/object-flags.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index ded440d..b732b53 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -35,7 +35,6 @@
 #include "locale/vowel-checker.h"
 #include "mind/mind-sniper.h"
 #include "monster/monster-status.h"
-#include "mspell/monster-spell.h"
 #include "mutation/mutation.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 429661d..9ccb86d 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -178,7 +178,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "mspell/monster-spell.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 9bf6afa..fb0639e 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -60,7 +60,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
-#include "mspell/monster-spell.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/object-boost.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 7152806..a496268 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -45,7 +45,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/smart-learn-types.h"
-#include "mspell/monster-spell.h"
+#include "mspell/mspells3.h"
 #include "mutation/mutation.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/artifact.h"