[Refactor] #40014 Removed unused inclusion for monster2.h

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 3a95f33..9fac456 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -18,7 +18,6 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "object/item-use-flags.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 50d4531..fe462dd 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -2,8 +2,8 @@
 #include "autopick/autopick.h"
 #include "floor/floor-object.h"
 #include "monster/monster-info.h"
-#include "monster/place-monster-types.h"
 #include "monster/monster2.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-broken.h"
 #include "object/object-flags.h"

diff --git a/src/mind/mind-cavalry.c b/src/mind/mind-cavalry.c
index ee693af..7c940e9 100644 (file)
--- a/src/mind/mind-cavalry.c
+++ b/src/mind/mind-cavalry.c
@@ -12,7 +12,6 @@
 #include "monster/smart-learn-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-skill.h"
 

diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c
index cf984cb..6f844f4 100644 (file)
--- a/src/monster-attack/monster-attack-player.c
+++ b/src/monster-attack/monster-attack-player.c
@@ -27,7 +27,6 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "object/object-hook.h"
 #include "pet/pet-fall-off.h"

diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index 728ad7c..794b7b6 100644 (file)
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -12,7 +12,6 @@
 #include "monster/monster-processor-util.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "pet/pet-util.h"
 #include "spell/range-calc.h"
 

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index 45014fa..0d56035 100644 (file)
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -20,7 +20,6 @@
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "pet/pet-util.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index 1f58a61..b14104e 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -15,28 +15,28 @@
 
 #include "monster/monster-processor.h"
 #include "cmd-io/cmd-dump.h"
+#include "core/speed-table.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "io/write-diary.h"
 #include "melee/melee-postprocess.h"
-#include "monster-race/race-indice-types.h"
-#include "core/speed-table.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"
+#include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-direction.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-move.h"
+#include "monster/monster-processor-util.h"
 #include "monster/monster-runaway.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster-processor-util.h"
 #include "monster/monster-util.h"
-#include "monster/monster-info.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/quantum-effect.h"

diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c
index c2b655e..bbada52 100644 (file)
--- a/src/monster/monster-sweep-grid.c
+++ b/src/monster/monster-sweep-grid.c
@@ -13,10 +13,9 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags4.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-safety-hiding.h"
 #include "monster/monster-status.h"
-#include "monster/monster-info.h"
-#include "monster/monster2.h"
 #include "mspell/monster-spell.h"
 
  /*!

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index f9158c4..930b531 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -11,10 +11,9 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
-#include "monster/monster-info.h"
 #include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "player/eldritch-horror.h"
 #include "player/player-move.h"
 

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index d38228a..db6d54b 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -13,8 +13,8 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
+#include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-status.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index ac8ceab..6cb3927 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -10,9 +10,9 @@
 #include "mind/drs-types.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
-#include "monster/monster-status.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index d32b1eb..c8e715f 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -55,8 +55,8 @@
 #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/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/assign-monster-spell.h"

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index 81b6eb6..239f880 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -25,8 +25,8 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
+#include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index a529f46..8ef37dc 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -25,8 +25,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags4.h"
 #include "monster/monster-describer.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
+#include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "mspell/monster-spell.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 72ec6c5..d7fa88c 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -166,7 +166,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster2.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 2c0f6f0..33e868c 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -9,8 +9,8 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags4.h"
 #include "monster-race/monster-race-hook.h"
-#include "monster/monster-util.h"
 #include "monster/monster-info.h"
+#include "monster/monster-util.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "room/pit-nest-kinds-table.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index cb5ec7c..dee37a2 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -10,7 +10,6 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
-#include "monster/monster2.h"
 #include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "spell/process-effect.h"