[Refactor] #37353 externs.h から monster-spell.h への宣言移動。

diff --git a/src/dungeon.c b/src/dungeon.c
index 2c3b4d0..2ce2518 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -38,6 +38,7 @@
 #include "spells-object.h"
 #include "spells-status.h"
 #include "spells-floor.h"
+#include "monster-spell.h"
 #include "mind.h"
 #include "world.h"
 #include "mutation.h"

diff --git a/src/externs.h b/src/externs.h
index fd1e43b..31521e2 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -894,35 +894,6 @@ extern bool tgt_pt(POSITION *x, POSITION *y);
 extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, concptr effect_msg);
 
-/* mspells1.c */
-extern bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend);
-extern bool summon_possible(POSITION y1, POSITION x1);
-extern bool raise_possible(monster_type *m_ptr);
-extern bool dispel_check(MONSTER_IDX m_idx);
-extern bool spell_is_inate(SPELL_IDX spell);
-extern bool make_attack_spell(MONSTER_IDX m_idx);
-extern void beam(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
-extern void bolt(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
-extern void breath(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(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
-extern bool monst_spell_monst(MONSTER_IDX m_idx);
-
-/* mspells3.c */
-extern bool do_cmd_cast_learned(void);
-extern void learn_spell(int monspell);
-extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode);
-
-/* mspells4.c */
-extern bool spell_learnable(MONSTER_IDX m_idx);
-extern HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx);
-extern HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx);
-extern HIT_POINT monspell_damage(int SPELL_NUM, MONSTER_IDX m_idx, int TYPE);
-extern HIT_POINT monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE);
-extern HIT_POINT monspell_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, int TYPE);
-
-
 /*
  * Hack -- conditional (or "bizarre") externs
  */

diff --git a/src/monster-spell.h b/src/monster-spell.h
index 4138d69..c7dfbb3 100644 (file)
--- a/src/monster-spell.h
+++ b/src/monster-spell.h
@@ -256,3 +256,31 @@
 
 extern const monster_power monster_powers[MAX_MONSPELLS];
 extern const concptr monster_powers_short[MAX_MONSPELLS];
+
+/* mspells1.c */
+extern bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend);
+extern bool summon_possible(POSITION y1, POSITION x1);
+extern bool raise_possible(monster_type *m_ptr);
+extern bool dispel_check(MONSTER_IDX m_idx);
+extern bool spell_is_inate(SPELL_IDX spell);
+extern bool make_attack_spell(MONSTER_IDX m_idx);
+extern void beam(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
+extern void bolt(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int dam_hp, int monspell, int target_type);
+extern void breath(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(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
+extern bool monst_spell_monst(MONSTER_IDX m_idx);
+
+/* mspells3.c */
+extern bool do_cmd_cast_learned(void);
+extern void learn_spell(int monspell);
+extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode);
+
+/* mspells4.c */
+extern bool spell_learnable(MONSTER_IDX m_idx);
+extern HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx);
+extern HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx);
+extern HIT_POINT monspell_damage(int SPELL_NUM, MONSTER_IDX m_idx, int TYPE);
+extern HIT_POINT monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE);
+extern HIT_POINT monspell_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, int TYPE);

diff --git a/src/player-damage.c b/src/player-damage.c
index 623364b..06e3a67 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -6,6 +6,7 @@
 #include "object-broken.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "monster-spell.h"
 
 
 /*!

diff --git a/src/player-effects.c b/src/player-effects.c
index 85e81eb..49ce304 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -30,6 +30,7 @@
 #include "snipe.h"
 #include "files.h"
 #include "player-effects.h"
+#include "monster-spell.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/wizard2.c b/src/wizard2.c
index 72dc940..117763d 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -36,6 +36,7 @@
 #include "grid.h"
 #include "dungeon-file.h"
 #include "files.h"
+#include "monster-spell.h"
 
 #ifdef ALLOW_WIZARD