[Refactor] #37353 モンスター配置に関する関数整理中。 / Refactor functions for place monster.

diff --git a/src/chest.c b/src/chest.c
index cfce968..b8e2e9c 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -1,6 +1,6 @@
 
 #include "angband.h"
-#include "monster.h"
+#include "spells-summon.h"
 
 /*!
 * @brief 箱からアイテムを引き出す /

diff --git a/src/dungeon.c b/src/dungeon.c
index 4e019da..a927867 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -25,7 +25,7 @@
 #include "floor-events.h"
 #include "object-curse.h"
 #include "store.h"
-#include "monster.h"
+#include "spells-summon.h"
 #include "monsterrace-hook.h"
 #include "world.h"
 

diff --git a/src/externs.h b/src/externs.h
index dc7c25e..93573b6 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -761,13 +761,6 @@ extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER n
 extern void sanity_blast(monster_type *m_ptr, bool necro);
 extern void update_monster(MONSTER_IDX m_idx, bool full);
 extern void update_monsters(bool full);
-extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode);
-extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode);
-extern bool alloc_horde(POSITION y, POSITION x);
-extern bool alloc_guardian(bool def_val);
-extern bool alloc_monster(POSITION dis, BIT_FLAGS mode);
-extern bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode, SYMBOL_CODE symbol);
-extern bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode);
 extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode);
 extern void update_smart_learn(MONSTER_IDX m_idx, int what);
 extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);

diff --git a/src/floor-save.c b/src/floor-save.c
index 52122dc..e9bcabf 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -14,6 +14,7 @@
 #include "floor.h"
 #include "generate.h"
 #include "grid.h"
+#include "monster.h"
 
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */

diff --git a/src/monster1.c b/src/monster1.c
index b8be3f5..347972a 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -16,6 +16,7 @@
 #include "objectkind-hook.h"
 #include "projection.h"
 #include "monster.h"
+#include "spells-summon.h"
 
 
 /*

diff --git a/src/monster2.c b/src/monster2.c
index c7b62f1..d4e61e6 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -16,6 +16,7 @@
 #include "monster-status.h"
 #include "projection.h"
 #include "monster.h"
+#include "spells-summon.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */

diff --git a/src/spells-summon.h b/src/spells-summon.h
index 9f3b3d8..5c201d9 100644 (file)
--- a/src/spells-summon.h
+++ b/src/spells-summon.h
@@ -1,6 +1,9 @@
 #pragma once\r
 #include "monster.h"\r
 \r
+extern bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode, SYMBOL_CODE symbol);\r
+extern bool summon_named_creature(MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode);\r
+\r
 extern bool trump_summoning(int num, bool pet, POSITION y, POSITION x, DEPTH lev, int type, BIT_FLAGS mode);\r
 extern bool cast_summon_demon(int power);\r
 extern bool item_tester_offer(object_type *o_ptr);\r

diff --git a/src/spells1.c b/src/spells1.c
index 4755f03..dffbb8f 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -18,6 +18,7 @@
 #include "player-damage.h"
 
 #include "monster.h"
+#include "spells-summon.h"
 #include "monsterrace-hook.h"
 
 #include "melee.h"

diff --git a/src/xtra2.c b/src/xtra2.c
index 8cc9ec4..307abf1 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -19,6 +19,7 @@
 #include "objectkind-hook.h"
 #include "sort.h"
 #include "projection.h"
+#include "spells-summon.h"
 
 #define REWARD_CHANCE 10