[Refactor] #37353 set_monster_*() の宣言を整理。

diff --git a/src/effects.c b/src/effects.c
index 0c29859..a24e008 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -24,6 +24,7 @@
 #include "wild.h"
 #include "spells-floor.h"
 #include "player-move.h"
+#include "monster-status.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/externs.h b/src/externs.h
index a66c9bb..c9a2115 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -549,13 +549,6 @@ extern void process_monsters(void);
 extern void process_monster(MONSTER_IDX m_idx);
 extern int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type);
 extern void mproc_init(void);
-extern bool set_monster_csleep(MONSTER_IDX m_idx, int v);
-extern bool set_monster_fast(MONSTER_IDX m_idx, int v);
-extern bool set_monster_slow(MONSTER_IDX m_idx, int v);
-extern bool set_monster_stunned(MONSTER_IDX m_idx, int v);
-extern bool set_monster_confused(MONSTER_IDX m_idx, int v);
-extern bool set_monster_monfear(MONSTER_IDX m_idx, int v);
-extern bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need);
 extern void process_monsters_mtimed(int mtimed_idx);
 extern void dispel_monster_status(MONSTER_IDX m_idx);
 extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, MONSTER_IDX who);

diff --git a/src/mind.c b/src/mind.c
index e090982..43172ae 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -28,6 +28,7 @@
 #include "feature.h"
 #include "grid.h"
 #include "cmd-basic.h"
+#include "monster-status.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/monster-status.h b/src/monster-status.h
index a812521..a26e827 100644 (file)
--- a/src/monster-status.h
+++ b/src/monster-status.h
@@ -1,6 +1,14 @@
-
+#pragma once
+
 extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear);
 extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note);
 extern int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type);
 extern bool monster_is_valid(monster_type *m_ptr);
 
+extern bool set_monster_csleep(MONSTER_IDX m_idx, int v);
+extern bool set_monster_fast(MONSTER_IDX m_idx, int v);
+extern bool set_monster_slow(MONSTER_IDX m_idx, int v);
+extern bool set_monster_stunned(MONSTER_IDX m_idx, int v);
+extern bool set_monster_confused(MONSTER_IDX m_idx, int v);
+extern bool set_monster_monfear(MONSTER_IDX m_idx, int v);
+extern bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need);

diff --git a/src/mspells4.c b/src/mspells4.c
index 92ce8df..e7c18ff 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -15,6 +15,7 @@
 #include "realm-hex.h"
 #include "player-move.h"
 #include "monster-spell.h"
+#include "monster-status.h"
 #include "spells.h"
 
 

diff --git a/src/player-move.c b/src/player-move.c
index e170994..45935dd 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -153,6 +153,7 @@
 #include "warning.h"
 #include "monster.h"
 #include "monster-spell.h"
+#include "monster-status.h"
 #include "object-hook.h"
 #include "object-flavor.h"
 #include "spells.h"