[Refactor] #40014 Separated monster-remover.c/h from monster2.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 5e81400..47d7e88 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -192,6 +192,7 @@
     <ClCompile Include="..\..\src\monster-lore\monster-lore.c" />\r
     <ClCompile Include="..\..\src\monster\monster-describer.c" />\r
     <ClCompile Include="..\..\src\monster\monster-generator.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-remover.c" />\r
     <ClCompile Include="..\..\src\monster\monster-util.c" />\r
     <ClCompile Include="..\..\src\mspell\summon-checker.c" />\r
     <ClCompile Include="..\..\src\object-enchant\activation-info-table.c" />\r
@@ -557,6 +558,7 @@
     <ClInclude Include="..\..\src\monster\monster-description-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-flag-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-generator.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-remover.h" />\r
     <ClInclude Include="..\..\src\monster\monster-timed-effect-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-util.h" />\r
     <ClInclude Include="..\..\src\monster\monster-info.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 034f9b5..8878713 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1277,6 +1277,9 @@
     <ClCompile Include="..\..\src\monster\monster-generator.c">
       <Filter>monster</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-remover.c">
+      <Filter>monster</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2806,6 +2809,9 @@
     <ClInclude Include="..\..\src\monster\monster-generator.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-remover.h">
+      <Filter>monster</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5686455..06b1afc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -293,6 +293,7 @@ hengband_SOURCES = \
        monster/monster-object.c monster/monster-object.h \
        monster/monster-processor.c monster/monster-processor.h \
        monster/monster-processor-util.c monster/monster-processor-util.h \
+       monster/monster-remover.c monster/monster-remover.h \
        monster/monster-runaway.c monster/monster-runaway.h \
        monster/monster-safety-hiding.c monster/monster-safety-hiding.h \
        monster/monster-timed-effect-types.h \

diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c
index f4b6fa0..a03c4d8 100644 (file)
--- a/src/birth/character-builder.c
+++ b/src/birth/character-builder.c
@@ -20,7 +20,7 @@
 #include "floor/wild.h"
 #include "io/write-diary.h"
 #include "main/music-definitions-table.h"
-#include "monster/monster2.h"
+#include "monster/monster-remover.h"
 #include "player/player-races-table.h"
 #include "player/player-sex.h"
 #include "store/store.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 9ee0922..cb7c680 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -14,6 +14,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index bd87086..898052e 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -40,6 +40,7 @@
 #include "market/bounty.h"
 #include "monster-race/race-indice-types.h"
 #include "core/speed-table.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index abd79ec..3fbf1e4 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -10,6 +10,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster2.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index fd9ae75..6005651 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -5,8 +5,8 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/monster-generator.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "player/avatar.h"
 
 // Powerful monsters can resist.

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 9a5994b..537af2c 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -20,6 +20,7 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-death.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster2.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 1a2f750..c1bb8d3 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -30,6 +30,7 @@
 #include "market/arena-info-table.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 0301fa0..ecba6f0 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -37,6 +37,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-info.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 2a6ceaa..ddf4d88 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -7,6 +7,7 @@
 #include "floor/floor-object.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-update.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 5c7105f..a298a9d 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -21,6 +21,7 @@
 #include "io/files-util.h"
 #include "io/tokenizer.h"
 #include "main/init.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-util.h"
 #include "monster/monster-info.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index ee6cc7b..4230844 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -22,10 +22,10 @@
 #include "floor/floor-generate.h"
 #include "grid/feature.h"
 #include "grid/trap.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
+#include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index 982312f..1193a38 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -23,6 +23,7 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-death.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index 448018e..a75ab4c 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -34,6 +34,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-move.h"
 #include "monster/monster-processor-util.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-runaway.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"

diff --git a/src/monster/monster-remover.c b/src/monster/monster-remover.c
new file mode 100644 (file)
index 0000000..745d682
--- /dev/null
+++ b/src/monster/monster-remover.c
@@ -0,0 +1,136 @@
+#include "monster/monster-remover.h"
+#include "floor/floor-object.h"
+#include "floor/floor.h"
+#include "io/targeting.h"
+#include "monster-race/race-flags2.h"
+#include "monster-race/race-flags7.h"
+#include "monster-race/race-indice-types.h"
+#include "monster/monster-info.h"
+#include "monster/monster-status.h"
+#include "system/monster-type-definition.h"
+#include "view/display-main-window.h"
+
+/*!
+ * @brief モンスター配列からモンスターを消去する / Delete a monster by index.
+ * @param i 消去するモンスターのID
+ * @return なし
+ * @details
+ * モンスターを削除するとそのモンスターが拾っていたアイテムも同時に削除される。 /
+ * When a monster is deleted, all of its objects are deleted.
+ */
+void delete_monster_idx(player_type *player_ptr, MONSTER_IDX i)
+{
+    floor_type *floor_ptr = player_ptr->current_floor_ptr;
+    monster_type *m_ptr = &floor_ptr->m_list[i];
+    monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+    POSITION y = m_ptr->fy;
+    POSITION x = m_ptr->fx;
+
+    real_r_ptr(m_ptr)->cur_num--;
+    if (r_ptr->flags2 & (RF2_MULTIPLY))
+        floor_ptr->num_repro--;
+
+    if (monster_csleep_remaining(m_ptr))
+        (void)set_monster_csleep(player_ptr, i, 0);
+    if (monster_fast_remaining(m_ptr))
+        (void)set_monster_fast(player_ptr, i, 0);
+    if (monster_slow_remaining(m_ptr))
+        (void)set_monster_slow(player_ptr, i, 0);
+    if (monster_stunned_remaining(m_ptr))
+        (void)set_monster_stunned(player_ptr, i, 0);
+    if (monster_confused_remaining(m_ptr))
+        (void)set_monster_confused(player_ptr, i, 0);
+    if (monster_fear_remaining(m_ptr))
+        (void)set_monster_monfear(player_ptr, i, 0);
+    if (monster_invulner_remaining(m_ptr))
+        (void)set_monster_invulner(player_ptr, i, 0, FALSE);
+
+    if (i == target_who)
+        target_who = 0;
+
+    if (i == player_ptr->health_who)
+        health_track(player_ptr, 0);
+
+    if (player_ptr->pet_t_m_idx == i)
+        player_ptr->pet_t_m_idx = 0;
+    if (player_ptr->riding_t_m_idx == i)
+        player_ptr->riding_t_m_idx = 0;
+    if (player_ptr->riding == i)
+        player_ptr->riding = 0;
+
+    floor_ptr->grid_array[y][x].m_idx = 0;
+    OBJECT_IDX next_o_idx = 0;
+    for (OBJECT_IDX this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx) {
+        object_type *o_ptr;
+        o_ptr = &floor_ptr->o_list[this_o_idx];
+        next_o_idx = o_ptr->next_o_idx;
+        delete_object_idx(player_ptr, this_o_idx);
+    }
+
+    (void)WIPE(m_ptr, monster_type);
+    floor_ptr->m_cnt--;
+    lite_spot(player_ptr, y, x);
+    if (r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) {
+        player_ptr->update |= (PU_MON_LITE);
+    }
+}
+
+/*!
+ * todo ここには本来floor_type*を追加したいが、monster.hにfloor.hの参照を追加するとコンパイルエラーが出るので保留
+ * @brief プレイヤーのフロア離脱に伴う全モンスター配列の消去 / Delete/Remove all the monsters when the player leaves the level
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ * @details
+ * This is an efficient method of simulating multiple calls to the
+ * "delete_monster()" function, with no visual effects.
+ */
+void wipe_monsters_list(player_type *player_ptr)
+{
+    if (!r_info[MON_BANORLUPART].max_num) {
+        if (r_info[MON_BANOR].max_num) {
+            r_info[MON_BANOR].max_num = 0;
+            r_info[MON_BANOR].r_pkills++;
+            r_info[MON_BANOR].r_akills++;
+            if (r_info[MON_BANOR].r_tkills < MAX_SHORT)
+                r_info[MON_BANOR].r_tkills++;
+        }
+
+        if (r_info[MON_LUPART].max_num) {
+            r_info[MON_LUPART].max_num = 0;
+            r_info[MON_LUPART].r_pkills++;
+            r_info[MON_LUPART].r_akills++;
+            if (r_info[MON_LUPART].r_tkills < MAX_SHORT)
+                r_info[MON_LUPART].r_tkills++;
+        }
+    }
+
+    floor_type *floor_ptr = player_ptr->current_floor_ptr;
+    for (int i = floor_ptr->m_max - 1; i >= 1; i--) {
+        monster_type *m_ptr = &floor_ptr->m_list[i];
+        if (!monster_is_valid(m_ptr))
+            continue;
+
+        floor_ptr->grid_array[m_ptr->fy][m_ptr->fx].m_idx = 0;
+        (void)WIPE(m_ptr, monster_type);
+    }
+
+    /*
+     * Wiping racial counters of all monsters and incrementing of racial
+     * counters of monsters in party_mon[] are required to prevent multiple
+     * generation of unique monster who is the minion of player.
+     */
+    for (int i = 1; i < max_r_idx; i++)
+        r_info[i].cur_num = 0;
+
+    floor_ptr->m_max = 1;
+    floor_ptr->m_cnt = 0;
+    for (int i = 0; i < MAX_MTIMED; i++)
+        floor_ptr->mproc_max[i] = 0;
+
+    floor_ptr->num_repro = 0;
+    target_who = 0;
+    player_ptr->pet_t_m_idx = 0;
+    player_ptr->riding_t_m_idx = 0;
+    health_track(player_ptr, 0);
+}

diff --git a/src/monster/monster-remover.h b/src/monster/monster-remover.h
new file mode 100644 (file)
index 0000000..06d7a4e
--- /dev/null
+++ b/src/monster/monster-remover.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "system/angband.h"
+
+void delete_monster_idx(player_type *player_ptr, MONSTER_IDX i);
+void wipe_monsters_list(player_type *player_ptr);

diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index 0424aae..998abb5 100644 (file)
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -12,7 +12,7 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
+#include "monster/monster-remover.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-move.h"
 

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 6cb2998..8aaa532 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -30,6 +30,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-generator.h"
 #include "monster/monster-processor.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
 #include "monster/monster-info.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 8d723d6..0fc3411 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -34,6 +34,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-generator.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
@@ -78,72 +79,6 @@ void set_target(monster_type *m_ptr, POSITION y, POSITION x)
 void reset_target(monster_type *m_ptr) { set_target(m_ptr, 0, 0); }
 
 /*!
- * @brief モンスター配列からモンスターを消去する / Delete a monster by index.
- * @param i 消去するモンスターのID
- * @return なし
- * @details
- * モンスターを削除するとそのモンスターが拾っていたアイテムも同時に削除される。 /
- * When a monster is deleted, all of its objects are deleted.
- */
-void delete_monster_idx(player_type *player_ptr, MONSTER_IDX i)
-{
-    floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    monster_type *m_ptr = &floor_ptr->m_list[i];
-    monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
-    POSITION y = m_ptr->fy;
-    POSITION x = m_ptr->fx;
-
-    real_r_ptr(m_ptr)->cur_num--;
-    if (r_ptr->flags2 & (RF2_MULTIPLY))
-        floor_ptr->num_repro--;
-
-    if (monster_csleep_remaining(m_ptr))
-        (void)set_monster_csleep(player_ptr, i, 0);
-    if (monster_fast_remaining(m_ptr))
-        (void)set_monster_fast(player_ptr, i, 0);
-    if (monster_slow_remaining(m_ptr))
-        (void)set_monster_slow(player_ptr, i, 0);
-    if (monster_stunned_remaining(m_ptr))
-        (void)set_monster_stunned(player_ptr, i, 0);
-    if (monster_confused_remaining(m_ptr))
-        (void)set_monster_confused(player_ptr, i, 0);
-    if (monster_fear_remaining(m_ptr))
-        (void)set_monster_monfear(player_ptr, i, 0);
-    if (monster_invulner_remaining(m_ptr))
-        (void)set_monster_invulner(player_ptr, i, 0, FALSE);
-
-    if (i == target_who)
-        target_who = 0;
-
-    if (i == player_ptr->health_who)
-        health_track(player_ptr, 0);
-
-    if (player_ptr->pet_t_m_idx == i)
-        player_ptr->pet_t_m_idx = 0;
-    if (player_ptr->riding_t_m_idx == i)
-        player_ptr->riding_t_m_idx = 0;
-    if (player_ptr->riding == i)
-        player_ptr->riding = 0;
-
-    floor_ptr->grid_array[y][x].m_idx = 0;
-    OBJECT_IDX next_o_idx = 0;
-    for (OBJECT_IDX this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx) {
-        object_type *o_ptr;
-        o_ptr = &floor_ptr->o_list[this_o_idx];
-        next_o_idx = o_ptr->next_o_idx;
-        delete_object_idx(player_ptr, this_o_idx);
-    }
-
-    (void)WIPE(m_ptr, monster_type);
-    floor_ptr->m_cnt--;
-    lite_spot(player_ptr, y, x);
-    if (r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) {
-        player_ptr->update |= (PU_MON_LITE);
-    }
-}
-
-/*!
  * @brief モンスター情報を配列内移動する / Move an object from index i1 to index i2 in the object list
  * @param player_ptr プレーヤーへの参照ポインタ
  * @param i1 配列移動元添字
@@ -276,65 +211,6 @@ void compact_monsters(player_type *player_ptr, int size)
 
 /*!
  * todo ここには本来floor_type*を追加したいが、monster.hにfloor.hの参照を追加するとコンパイルエラーが出るので保留
- * @brief プレイヤーのフロア離脱に伴う全モンスター配列の消去 / Delete/Remove all the monsters when the player leaves the level
- * @param player_ptr プレーヤーへの参照ポインタ
- * @return なし
- * @details
- * This is an efficient method of simulating multiple calls to the
- * "delete_monster()" function, with no visual effects.
- */
-void wipe_monsters_list(player_type *player_ptr)
-{
-    if (!r_info[MON_BANORLUPART].max_num) {
-        if (r_info[MON_BANOR].max_num) {
-            r_info[MON_BANOR].max_num = 0;
-            r_info[MON_BANOR].r_pkills++;
-            r_info[MON_BANOR].r_akills++;
-            if (r_info[MON_BANOR].r_tkills < MAX_SHORT)
-                r_info[MON_BANOR].r_tkills++;
-        }
-
-        if (r_info[MON_LUPART].max_num) {
-            r_info[MON_LUPART].max_num = 0;
-            r_info[MON_LUPART].r_pkills++;
-            r_info[MON_LUPART].r_akills++;
-            if (r_info[MON_LUPART].r_tkills < MAX_SHORT)
-                r_info[MON_LUPART].r_tkills++;
-        }
-    }
-
-    floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    for (int i = floor_ptr->m_max - 1; i >= 1; i--) {
-        monster_type *m_ptr = &floor_ptr->m_list[i];
-        if (!monster_is_valid(m_ptr))
-            continue;
-
-        floor_ptr->grid_array[m_ptr->fy][m_ptr->fx].m_idx = 0;
-        (void)WIPE(m_ptr, monster_type);
-    }
-
-    /*
-     * Wiping racial counters of all monsters and incrementing of racial
-     * counters of monsters in party_mon[] are required to prevent multiple
-     * generation of unique monster who is the minion of player.
-     */
-    for (int i = 1; i < max_r_idx; i++)
-        r_info[i].cur_num = 0;
-
-    floor_ptr->m_max = 1;
-    floor_ptr->m_cnt = 0;
-    for (int i = 0; i < MAX_MTIMED; i++)
-        floor_ptr->mproc_max[i] = 0;
-
-    floor_ptr->num_repro = 0;
-    target_who = 0;
-    player_ptr->pet_t_m_idx = 0;
-    player_ptr->riding_t_m_idx = 0;
-    health_track(player_ptr, 0);
-}
-
-/*!
- * todo ここには本来floor_type*を追加したいが、monster.hにfloor.hの参照を追加するとコンパイルエラーが出るので保留
  * @brief モンスター配列の空きを探す / Acquires and returns the index of a "free" monster.
  * @return 利用可能なモンスター配列の添字
  * @details

diff --git a/src/monster/monster2.h b/src/monster/monster2.h
index 02917ad..8ae579d 100644 (file)
--- a/src/monster/monster2.h
+++ b/src/monster/monster2.h
@@ -5,9 +5,7 @@
 
 void set_target(monster_type *m_ptr, POSITION y, POSITION x);
 void reset_target(monster_type *m_ptr);
-void delete_monster_idx(player_type *player_ptr, MONSTER_IDX i);
 void compact_monsters(player_type *player_ptr, int size);
-void wipe_monsters_list(player_type *player_ptr);
 MONSTER_IDX m_pop(player_type *player_ptr);
 
 #define GMN_ARENA 0x00000001 //!< 賭け闘技場向け生成

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index 23cf0e0..c40a99f 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -5,7 +5,7 @@
 #include "monster/monster-death.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
+#include "monster/monster-remover.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index f2e62b0..e578c5f 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -15,6 +15,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-generator.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 976de51..be7139c 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -29,9 +29,9 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-generator.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-description-types.h"
 #include "monster/place-monster-types.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object/object-hook.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index daba4fc..f6090ae 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -29,9 +29,9 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "mutation/mutation.h"
 #include "object-enchant/object-ego.h"

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 1b39b91..8203842 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -9,9 +9,9 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
+#include "monster/monster-remover.h"
+#include "monster/monster-status.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "view/display-main-window.h"

diff --git a/src/spell-kind/spells-pet.c b/src/spell-kind/spells-pet.c
index 28041d8..06889fd 100644 (file)
--- a/src/spell-kind/spells-pet.c
+++ b/src/spell-kind/spells-pet.c
@@ -6,7 +6,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
+#include "monster/monster-remover.h"
 #include "monster/smart-learn-types.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index 069a534..d534220 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -21,9 +21,10 @@
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index eca87d8..359ef60 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -43,6 +43,7 @@
 #include "monster/monster-generator.h"
 #include "monster/monster-info.h"
 #include "monster/monster-processor.h"
+#include "monster/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index df80207..6443e51 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -35,6 +35,7 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-generator.h"
 #include "monster/monster-info.h"
+#include "monster/monster-remover.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"