[Refactor] #37353 monster.h に関数定義移動。

diff --git a/src/bldg.c b/src/bldg.c
index bb98d0c..f79e990 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -16,6 +16,7 @@
 #include "floor.h"
 #include "object-boost.h"
 #include "object-hook.h"
+#include "monster.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "wild.h"

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 6dc6f3e..7dc6d1e 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -27,6 +27,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "monster.h"
 
 
 /*!

diff --git a/src/externs.h b/src/externs.h
index c1622e8..94fd758 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -651,26 +651,8 @@ extern bool process_the_world(int num, MONSTER_IDX who, bool vs_player);
 extern void monster_gain_exp(MONSTER_IDX m_idx, MONRACE_IDX s_idx);
 
 /* monster1.c */
-extern void roff_top(MONRACE_IDX r_idx);
-extern void screen_roff(MONRACE_IDX r_idx, BIT_FLAGS mode);
-extern void display_roff(MONRACE_IDX r_idx);
-extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str));
-extern void create_name(int type, char *name);
-extern concptr extract_note_dies(MONRACE_IDX r_idx);
-extern void monster_death(MONSTER_IDX m_idx, bool drop_item);
-
-extern monsterrace_hook_type get_monster_hook(void);
-extern monsterrace_hook_type get_monster_hook2(POSITION y, POSITION x);
-extern void set_friendly(monster_type *m_ptr);
-extern void set_pet(monster_type *m_ptr);
-extern void set_hostile(monster_type *m_ptr);
-extern void anger_monster(monster_type *m_ptr);
-extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode);
-extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 mode);
-extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
-extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
-extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);
-extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
+
+
 
 
 /* monster2.c */

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 696f2c9..72f8fb2 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -19,6 +19,7 @@
 #include "generate.h"
 #include "floor-streams.h"
 #include "grid.h"
+#include "monster.h"
 #include "feature.h"
 
 

diff --git a/src/monster.h b/src/monster.h
index 6f9ec69..5ac5624 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -34,3 +34,23 @@ extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode);
 #define MD_IGNORE_HALLU   0x00000200 /* Ignore hallucination, and penetrate shape change */
 
 #define MD_WRONGDOER_NAME (MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE) /* 加害明記向け */
+
+extern void roff_top(MONRACE_IDX r_idx);
+extern void screen_roff(MONRACE_IDX r_idx, BIT_FLAGS mode);
+extern void display_roff(MONRACE_IDX r_idx);
+extern void output_monster_spoiler(MONRACE_IDX r_idx, void(*roff_func)(TERM_COLOR attr, concptr str));
+extern void create_name(int type, char *name);
+extern concptr extract_note_dies(MONRACE_IDX r_idx);
+extern void monster_death(MONSTER_IDX m_idx, bool drop_item);
+extern monsterrace_hook_type get_monster_hook(void);
+extern monsterrace_hook_type get_monster_hook2(POSITION y, POSITION x);
+extern void set_friendly(monster_type *m_ptr);
+extern void set_pet(monster_type *m_ptr);
+extern void set_hostile(monster_type *m_ptr);
+extern void anger_monster(monster_type *m_ptr);
+extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode);
+extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 mode);
+extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
+extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
+extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);
+extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 4b45cfa..770a5f4 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -16,6 +16,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "monster.h"
 
  /*
   * Some screen locations for various display routines

diff --git a/src/wizard1.c b/src/wizard1.c
index 0605af5..0f4c9cc 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "sort.h"
 #include "store.h"
+#include "monster.h"
 
 
 #ifdef ALLOW_SPOILERS