[Refactor] #2649 Renamed monster-type-definition.cpp/h to monster-entity.cpp/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 93cc5ae..a96f0de 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -593,7 +593,7 @@
     <ClCompile Include="..\..\src\store\sell-order.cpp" />\r
     <ClCompile Include="..\..\src\store\service-checker.cpp" />\r
     <ClCompile Include="..\..\src\system\angband-version.cpp" />\r
-    <ClCompile Include="..\..\src\system\monster-type-definition.cpp" />\r
+    <ClCompile Include="..\..\src\system\monster-entity.cpp" />\r
     <ClCompile Include="..\..\src\system\item-entity.cpp" />\r
     <ClCompile Include="..\..\src\system\player-type-definition.cpp" />\r
     <ClCompile Include="..\..\src\system\terrain-type-definition.cpp" />\r
@@ -1942,7 +1942,7 @@
     <ClInclude Include="..\..\src\cmd-action\cmd-mind.h" />\r
     <ClInclude Include="..\..\src\monster\monster-processor.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
-    <ClInclude Include="..\..\src\system\monster-type-definition.h" />\r
+    <ClInclude Include="..\..\src\system\monster-entity.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-race-hook.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-race.h" />\r
     <ClInclude Include="..\..\src\mutation\mutation-calculator.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 4514a1e..46425d1 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2460,7 +2460,7 @@
     <ClCompile Include="..\..\src\timed-effect\player-blindness.cpp">\r
       <Filter>timed-effect</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\system\monster-type-definition.cpp">\r
+    <ClCompile Include="..\..\src\system\monster-entity.cpp">\r
       <Filter>system</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\system\baseitem-info-definition.cpp">\r
@@ -3671,7 +3671,7 @@
     <ClInclude Include="..\..\src\player\eldritch-horror.h">\r
       <Filter>player</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\system\monster-type-definition.h">\r
+    <ClInclude Include="..\..\src\system\monster-entity.h">\r
       <Filter>system</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\monster\monster-processor-util.h">\r

diff --git a/src/Makefile.am b/src/Makefile.am
index a77ca08..5875076 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -918,8 +918,8 @@ hengband_SOURCES = \
        system/h-basic.h system/h-config.h \
        system/h-system.h system/h-type.h \
        system/item-entity.cpp system/item-entity.h \
+       system/monster-entity.cpp system/monster-entity.h \
        system/monster-race-info.h \
-       system/monster-type-definition.cpp system/monster-type-definition.h \
        system/player-type-definition.cpp system/player-type-definition.h \
        system/system-variables.cpp system/system-variables.h \
        system/terrain-type-definition.cpp system/terrain-type-definition.h \

diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp
index 4d00cc5..ff36361 100644 (file)
--- a/src/action/activation-execution.cpp
+++ b/src/action/activation-execution.cpp
@@ -41,7 +41,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "term/screen-processor.h"

diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp
index 4197603..c53be94 100644 (file)
--- a/src/action/movement-execution.cpp
+++ b/src/action/movement-execution.cpp
@@ -41,8 +41,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-confusion.h"

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index a1fefeb..28d98d8 100644 (file)
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -49,8 +49,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp
index a73f437..e5c00c7 100644 (file)
--- a/src/action/run-execution.cpp
+++ b/src/action/run-execution.cpp
@@ -20,7 +20,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/action/travel-execution.cpp b/src/action/travel-execution.cpp
index 8fb636a..6e682ce 100644 (file)
--- a/src/action/travel-execution.cpp
+++ b/src/action/travel-execution.cpp
@@ -17,7 +17,7 @@
 #include "player/player-move.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/avatar/avatar-changer.cpp b/src/avatar/avatar-changer.cpp
index f0b091e..55c6098 100644 (file)
--- a/src/avatar/avatar-changer.cpp
+++ b/src/avatar/avatar-changer.cpp
@@ -16,8 +16,8 @@
 #include "monster/monster-info.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/blue-magic/blue-magic-caster.cpp b/src/blue-magic/blue-magic-caster.cpp
index 8b588cc..239c898 100644 (file)
--- a/src/blue-magic/blue-magic-caster.cpp
+++ b/src/blue-magic/blue-magic-caster.cpp
@@ -33,8 +33,8 @@
 #include "status/buff-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
index fa42491..4c7432f 100644 (file)
--- a/src/cmd-action/cmd-attack.cpp
+++ b/src/cmd-action/cmd-attack.cpp
@@ -48,8 +48,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-confusion.h"
 #include "timed-effect/player-fear.h"

diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index eb4c8ad..f71d1f4 100644 (file)
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -56,8 +56,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 77d0108..a15604c 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -51,8 +51,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/combat/attack-accuracy.cpp b/src/combat/attack-accuracy.cpp
index 9551f6e..61214b7 100644 (file)
--- a/src/combat/attack-accuracy.cpp
+++ b/src/combat/attack-accuracy.cpp
@@ -13,8 +13,8 @@
 #include "specific-object/death-scythe.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/attack-criticality.cpp b/src/combat/attack-criticality.cpp
index ed7d680..efc98a2 100644 (file)
--- a/src/combat/attack-criticality.cpp
+++ b/src/combat/attack-criticality.cpp
@@ -11,8 +11,8 @@
 #include "player-info/equipment-info.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/aura-counterattack.cpp b/src/combat/aura-counterattack.cpp
index 65822f7..ee0f5b1 100644 (file)
--- a/src/combat/aura-counterattack.cpp
+++ b/src/combat/aura-counterattack.cpp
@@ -26,8 +26,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 85f1b60..d26be14 100644 (file)
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -60,8 +60,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/combat/slaying.cpp b/src/combat/slaying.cpp
index 19b0ed5..1ab0e62 100644 (file)
--- a/src/combat/slaying.cpp
+++ b/src/combat/slaying.cpp
@@ -19,8 +19,8 @@
 #include "specific-object/torch.h"
 #include "spell-realm/spells-hex.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp
index 3e47dfa..d945dbc 100644 (file)
--- a/src/core/game-play.cpp
+++ b/src/core/game-play.cpp
@@ -84,8 +84,8 @@
 #include "system/angband-version.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "term/gameterm.h"

diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index 2b04494..1b7dd78 100644 (file)
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -7,7 +7,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include <algorithm>

diff --git a/src/dungeon/quest-completion-checker.cpp b/src/dungeon/quest-completion-checker.cpp
index 4b3f71f..9d1fe1d 100644 (file)
--- a/src/dungeon/quest-completion-checker.cpp
+++ b/src/dungeon/quest-completion-checker.cpp
@@ -15,8 +15,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp
index bd41cc8..e94ac68 100644 (file)
--- a/src/effect/effect-item.cpp
+++ b/src/effect/effect-item.cpp
@@ -20,7 +20,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-charm.cpp b/src/effect/effect-monster-charm.cpp
index 56afe5f..197a3cc 100644 (file)
--- a/src/effect/effect-monster-charm.cpp
+++ b/src/effect/effect-monster-charm.cpp
@@ -25,8 +25,8 @@
 #include "status/bad-status-setter.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-curse.cpp b/src/effect/effect-monster-curse.cpp
index 3eba652..61ac898 100644 (file)
--- a/src/effect/effect-monster-curse.cpp
+++ b/src/effect/effect-monster-curse.cpp
@@ -2,8 +2,8 @@
 #include "effect/effect-monster-util.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "view/display-messages.h"
 
 ProcessResult effect_monster_curse_1(effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-evil.cpp b/src/effect/effect-monster-evil.cpp
index 6676519..39b090b 100644 (file)
--- a/src/effect/effect-monster-evil.cpp
+++ b/src/effect/effect-monster-evil.cpp
@@ -6,8 +6,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-info.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 static bool effect_monster_away_resist(PlayerType *player_ptr, effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-oldies.cpp b/src/effect/effect-monster-oldies.cpp
index 8c54ee0..00fb869 100644 (file)
--- a/src/effect/effect-monster-oldies.cpp
+++ b/src/effect/effect-monster-oldies.cpp
@@ -13,8 +13,8 @@
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-psi.cpp b/src/effect/effect-monster-psi.cpp
index f841160..9841a83 100644 (file)
--- a/src/effect/effect-monster-psi.cpp
+++ b/src/effect/effect-monster-psi.cpp
@@ -16,8 +16,8 @@
 #include "player/player-damage.h"
 #include "status/bad-status-setter.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-resist-hurt.cpp b/src/effect/effect-monster-resist-hurt.cpp
index d7e4c2d..7f160be 100644 (file)
--- a/src/effect/effect-monster-resist-hurt.cpp
+++ b/src/effect/effect-monster-resist-hurt.cpp
@@ -11,8 +11,8 @@
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/effect/effect-monster-spirit.cpp b/src/effect/effect-monster-spirit.cpp
index ad03234..a9b32e9 100644 (file)
--- a/src/effect/effect-monster-spirit.cpp
+++ b/src/effect/effect-monster-spirit.cpp
@@ -12,8 +12,8 @@
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-switcher.cpp b/src/effect/effect-monster-switcher.cpp
index 80f623c..44a7712 100644 (file)
--- a/src/effect/effect-monster-switcher.cpp
+++ b/src/effect/effect-monster-switcher.cpp
@@ -31,8 +31,8 @@
 #include "player/player-damage.h"
 #include "spell-kind/spells-genocide.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-monster-util.cpp b/src/effect/effect-monster-util.cpp
index 9db6916..eda00c2 100644 (file)
--- a/src/effect/effect-monster-util.cpp
+++ b/src/effect/effect-monster-util.cpp
@@ -12,8 +12,8 @@
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp
index b46abbd..62e34c1 100644 (file)
--- a/src/effect/effect-monster.cpp
+++ b/src/effect/effect-monster.cpp
@@ -49,8 +49,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/effect/effect-player-curse.cpp b/src/effect/effect-player-curse.cpp
index f8c8ecb..d30075f 100644 (file)
--- a/src/effect/effect-player-curse.cpp
+++ b/src/effect/effect-player-curse.cpp
@@ -6,7 +6,7 @@
 #include "object-enchant/object-curse.h"
 #include "player/player-damage.h"
 #include "status/bad-status-setter.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/effect/effect-player-spirit.cpp b/src/effect/effect-player-spirit.cpp
index 60e80a1..98ab6b1 100644 (file)
--- a/src/effect/effect-player-spirit.cpp
+++ b/src/effect/effect-player-spirit.cpp
@@ -8,7 +8,7 @@
 #include "player/player-status-flags.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/effect/effect-player.cpp b/src/effect/effect-player.cpp
index da71472..774091d 100644 (file)
--- a/src/effect/effect-player.cpp
+++ b/src/effect/effect-player.cpp
@@ -28,8 +28,8 @@
 #include "spell-realm/spells-hex.h"
 #include "spell/spells-util.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/effect/effect-processor.cpp b/src/effect/effect-processor.cpp
index 477395d..d12426e 100644 (file)
--- a/src/effect/effect-processor.cpp
+++ b/src/effect/effect-processor.cpp
@@ -30,8 +30,8 @@
 #include "spell/range-calc.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index f49463a..51de86d 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -32,8 +32,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "window/main-window-util.h"
 #include "world/world-object.h"

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index 8b650aa..3763542 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -36,8 +36,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index 8c0e764..60f3f31 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -43,8 +43,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index 5267e04..32ed57d 100644 (file)
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -33,7 +33,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/floor/floor-save-util.h b/src/floor/floor-save-util.h
index b0b3b60..60f3f99 100644 (file)
--- a/src/floor/floor-save-util.h
+++ b/src/floor/floor-save-util.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 
 #define MAX_SAVED_FLOORS 20 /*!< 保存フロアの最大数 / Maximum number of saved floors. */
 #define MAX_PARTY_MON 21 /*!< フロア移動時に先のフロアに連れて行けるペットの最大数 Maximum number of preservable pets */

diff --git a/src/floor/floor-save.cpp b/src/floor/floor-save.cpp
index 06c7b79..04b550e 100644 (file)
--- a/src/floor/floor-save.cpp
+++ b/src/floor/floor-save.cpp
@@ -18,8 +18,8 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp
index 7cb3a3d..aac1b21 100644 (file)
--- a/src/floor/floor-streams.cpp
+++ b/src/floor/floor-streams.cpp
@@ -36,8 +36,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index 2fd1f43..559297d 100644 (file)
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -19,7 +19,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/floor/geometry.cpp b/src/floor/geometry.cpp
index 8fec347..d9b9ada 100644 (file)
--- a/src/floor/geometry.cpp
+++ b/src/floor/geometry.cpp
@@ -5,7 +5,7 @@
 #include "grid/grid.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index 717aff3..9c17fd0 100644 (file)
--- a/src/floor/wild.cpp
+++ b/src/floor/wild.cpp
@@ -40,7 +40,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index 2359414..c9e82f9 100644 (file)
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -49,8 +49,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/gameterm.h"

diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp
index 2abe2c7..b70b65a 100644 (file)
--- a/src/grid/trap.cpp
+++ b/src/grid/trap.cpp
@@ -37,7 +37,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index d9befbe..f9a2a32 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -39,8 +39,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-cut.h"

diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp
index 1d69768..bceef98 100644 (file)
--- a/src/hpmp/hp-mp-regenerator.cpp
+++ b/src/hpmp/hp-mp-regenerator.cpp
@@ -15,8 +15,8 @@
 #include "player/special-defense-types.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 8a1f755..8b1de39 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -36,8 +36,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include "util/int-char-converter.h"

diff --git a/src/io/cursor.cpp b/src/io/cursor.cpp
index 8ab10da..84cee82 100644 (file)
--- a/src/io/cursor.cpp
+++ b/src/io/cursor.cpp
@@ -12,7 +12,7 @@
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/knowledge/knowledge-monsters.cpp b/src/knowledge/knowledge-monsters.cpp
index 39982bf..a7ab15f 100644 (file)
--- a/src/knowledge/knowledge-monsters.cpp
+++ b/src/knowledge/knowledge-monsters.cpp
@@ -27,8 +27,8 @@
 #include "monster/smart-learn-types.h"
 #include "pet/pet-util.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/load/dummy-loader.cpp b/src/load/dummy-loader.cpp
index ec3d22d..1aa3390 100644 (file)
--- a/src/load/dummy-loader.cpp
+++ b/src/load/dummy-loader.cpp
@@ -4,7 +4,7 @@
 #include "load/monster/monster-loader-factory.h"
 #include "load/old/monster-loader-savefile50.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/load/old/load-v1-5-0.h b/src/load/old/load-v1-5-0.h
index 73b83c6..4a33358 100644 (file)
--- a/src/load/old/load-v1-5-0.h
+++ b/src/load/old/load-v1-5-0.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 
 // TODO: 更に分割する可能性が中程度あるのでヘッダに置いておく
 enum old_monster_resistance_type {

diff --git a/src/load/old/monster-loader-savefile50.cpp b/src/load/old/monster-loader-savefile50.cpp
index 6f0a740..29efad8 100644 (file)
--- a/src/load/old/monster-loader-savefile50.cpp
+++ b/src/load/old/monster-loader-savefile50.cpp
@@ -3,7 +3,7 @@
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
 #include "load/old/monster-flag-types-savefile50.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"

diff --git a/src/lore/lore-store.cpp b/src/lore/lore-store.cpp
index 043d42a..2f4b680 100644 (file)
--- a/src/lore/lore-store.cpp
+++ b/src/lore/lore-store.cpp
@@ -11,8 +11,8 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h" //!< @todo 違和感、m_ptr は外から与えることとしたい.
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h" //!< @todo 違和感、m_ptr は外から与えることとしたい.
 #include "system/player-type-definition.h"
 
 template <class T>

diff --git a/src/main/game-data-initializer.cpp b/src/main/game-data-initializer.cpp
index a640671..e80257d 100644 (file)
--- a/src/main/game-data-initializer.cpp
+++ b/src/main/game-data-initializer.cpp
@@ -16,8 +16,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "util/angband-files.h"

diff --git a/src/main/scene-table-monster.cpp b/src/main/scene-table-monster.cpp
index 0e50b9c..0838e21 100644 (file)
--- a/src/main/scene-table-monster.cpp
+++ b/src/main/scene-table-monster.cpp
@@ -9,8 +9,8 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "world/world.h"

diff --git a/src/melee/melee-postprocess.cpp b/src/melee/melee-postprocess.cpp
index 80c81e7..502b2f1 100644 (file)
--- a/src/melee/melee-postprocess.cpp
+++ b/src/melee/melee-postprocess.cpp
@@ -39,8 +39,8 @@
 #include "player-info/race-types.h"
 #include "player/player-personality-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/melee/melee-spell-flags-checker.cpp b/src/melee/melee-spell-flags-checker.cpp
index 760df99..b7c86e1 100644 (file)
--- a/src/melee/melee-spell-flags-checker.cpp
+++ b/src/melee/melee-spell-flags-checker.cpp
@@ -22,8 +22,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/melee/melee-spell-util.cpp b/src/melee/melee-spell-util.cpp
index 01c546b..2bdd854 100644 (file)
--- a/src/melee/melee-spell-util.cpp
+++ b/src/melee/melee-spell-util.cpp
@@ -7,8 +7,8 @@
 #include "monster/monster-info.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 melee_spell_type *initialize_melee_spell_type(PlayerType *player_ptr, melee_spell_type *ms_ptr, MONSTER_IDX m_idx)
@@ -26,6 +26,9 @@ melee_spell_type *initialize_melee_spell_type(PlayerType *player_ptr, melee_spel
     ms_ptr->see_m = is_seen(player_ptr, ms_ptr->m_ptr);
     ms_ptr->maneable = player_has_los_bold(player_ptr, ms_ptr->m_ptr->fy, ms_ptr->m_ptr->fx);
     ms_ptr->pet = ms_ptr->m_ptr->is_pet();
-    ms_ptr->in_no_magic_dungeon = dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::NO_MAGIC) && floor_ptr->dun_level && (!inside_quest(floor_ptr->quest_number) || quest_type::is_fixed(floor_ptr->quest_number));
+    const auto &dungeon = dungeons_info[player_ptr->dungeon_idx];
+    const auto is_in_dungeon = floor_ptr->is_in_dungeon();
+    const auto is_in_random_quest = inside_quest(floor_ptr->quest_number) && !quest_type::is_fixed(floor_ptr->quest_number);
+    ms_ptr->in_no_magic_dungeon = dungeon.flags.has(DungeonFeatureType::NO_MAGIC) && is_in_dungeon && !is_in_random_quest;
     return ms_ptr;
 }

diff --git a/src/melee/melee-spell.cpp b/src/melee/melee-spell.cpp
index e7db671..6a22253 100644 (file)
--- a/src/melee/melee-spell.cpp
+++ b/src/melee/melee-spell.cpp
@@ -15,8 +15,8 @@
 #include "player-info/mane-data-type.h"
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/melee/melee-switcher.cpp b/src/melee/melee-switcher.cpp
index 8bcb280..49b011e 100644 (file)
--- a/src/melee/melee-switcher.cpp
+++ b/src/melee/melee-switcher.cpp
@@ -10,7 +10,7 @@
 #include "monster-attack/monster-attack-effect.h"
 #include "monster/monster-status-setter.h"
 #include "spell-kind/earthquake.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/melee/melee-util.cpp b/src/melee/melee-util.cpp
index 72edaf5..606674b 100644 (file)
--- a/src/melee/melee-util.cpp
+++ b/src/melee/melee-util.cpp
@@ -4,8 +4,8 @@
 #include "melee/melee-switcher.h"
 #include "monster-race/monster-race.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/melee/monster-attack-monster.cpp b/src/melee/monster-attack-monster.cpp
index abf30bf..7fe69c6 100644 (file)
--- a/src/melee/monster-attack-monster.cpp
+++ b/src/melee/monster-attack-monster.cpp
@@ -33,8 +33,8 @@
 #include "spell-realm/spells-hex.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind-cavalry.cpp b/src/mind/mind-cavalry.cpp
index 986675c..9fdfc5f 100644 (file)
--- a/src/mind/mind-cavalry.cpp
+++ b/src/mind/mind-cavalry.cpp
@@ -16,8 +16,8 @@
 #include "pet/pet-fall-off.h"
 #include "player/player-skill.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp
index a83f6c8..3ef3e3f 100644 (file)
--- a/src/mind/mind-elementalist.cpp
+++ b/src/mind/mind-elementalist.cpp
@@ -59,8 +59,8 @@
 #include "system/floor-type-definition.h"
 #include "system/game-option-types.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/target-getter.h"

diff --git a/src/mind/mind-force-trainer.cpp b/src/mind/mind-force-trainer.cpp
index 3a05a8d..38b3268 100644 (file)
--- a/src/mind/mind-force-trainer.cpp
+++ b/src/mind/mind-force-trainer.cpp
@@ -30,8 +30,8 @@
 #include "status/temporary-resistance.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index 980b57a..3b7dec3 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -51,8 +51,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/mind/mind-samurai.cpp b/src/mind/mind-samurai.cpp
index 246d512..9fb9237 100644 (file)
--- a/src/mind/mind-samurai.cpp
+++ b/src/mind/mind-samurai.cpp
@@ -32,8 +32,8 @@
 #include "status/action-setter.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "timed-effect/player-cut.h"

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 68d5cc5..6d69f29 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -30,8 +30,8 @@
 #include "player-info/sniper-data-type.h"
 #include "player-status/player-energy.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/mind/monk-attack.cpp b/src/mind/monk-attack.cpp
index 8aee678..29f2243 100644 (file)
--- a/src/mind/monk-attack.cpp
+++ b/src/mind/monk-attack.cpp
@@ -27,8 +27,8 @@
 #include "player/special-defense-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "timed-effect/player-confusion.h"

diff --git a/src/monster-attack/monster-attack-describer.cpp b/src/monster-attack/monster-attack-describer.cpp
index 25a7c27..21dab62 100644 (file)
--- a/src/monster-attack/monster-attack-describer.cpp
+++ b/src/monster-attack/monster-attack-describer.cpp
@@ -12,7 +12,7 @@
 #include "monster-attack/monster-attack-table.h"
 #include "monster-race/race-indice-types.h"
 #include "system/angband.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 
 static void show_jaian_song(MonsterAttackPlayer *monap_ptr)
 {

diff --git a/src/monster-attack/monster-attack-player.cpp b/src/monster-attack/monster-attack-player.cpp
index 05fc1fe..043fecf 100644 (file)
--- a/src/monster-attack/monster-attack-player.cpp
+++ b/src/monster-attack/monster-attack-player.cpp
@@ -50,8 +50,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-cut.h"
 #include "timed-effect/player-hallucination.h"

diff --git a/src/monster-attack/monster-attack-processor.cpp b/src/monster-attack/monster-attack-processor.cpp
index 782fca6..39e5cf6 100644 (file)
--- a/src/monster-attack/monster-attack-processor.cpp
+++ b/src/monster-attack/monster-attack-processor.cpp
@@ -19,8 +19,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/monster-attack/monster-attack-status.cpp b/src/monster-attack/monster-attack-status.cpp
index b64ace3..2b364f3 100644 (file)
--- a/src/monster-attack/monster-attack-status.cpp
+++ b/src/monster-attack/monster-attack-status.cpp
@@ -15,8 +15,8 @@
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "status/experience.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-paralysis.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index 845c92b..67b4fc6 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -27,7 +27,7 @@
 #include "status/element-resistance.h"
 #include "status/experience.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-acceleration.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index f48635d..e856929 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -27,7 +27,7 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/player-paralysis.h"

diff --git a/src/monster-floor/monster-death-util.cpp b/src/monster-floor/monster-death-util.cpp
index 041ef5f..eb4d05c 100644 (file)
--- a/src/monster-floor/monster-death-util.cpp
+++ b/src/monster-floor/monster-death-util.cpp
@@ -5,8 +5,8 @@
 #include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index c9d8af6..41dfc5b 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -41,8 +41,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "timed-effect/player-hallucination.h"

diff --git a/src/monster-floor/monster-direction.cpp b/src/monster-floor/monster-direction.cpp
index ec30046..a946fb3 100644 (file)
--- a/src/monster-floor/monster-direction.cpp
+++ b/src/monster-floor/monster-direction.cpp
@@ -17,8 +17,8 @@
 #include "player/player-status-flags.h"
 #include "spell/range-calc.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 

diff --git a/src/monster-floor/monster-generator.cpp b/src/monster-floor/monster-generator.cpp
index 6805da5..cef7859 100644 (file)
--- a/src/monster-floor/monster-generator.cpp
+++ b/src/monster-floor/monster-generator.cpp
@@ -30,8 +30,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/monster-floor/monster-lite-util.cpp b/src/monster-floor/monster-lite-util.cpp
index 3cfeb7f..f559f24 100644 (file)
--- a/src/monster-floor/monster-lite-util.cpp
+++ b/src/monster-floor/monster-lite-util.cpp
@@ -1,6 +1,6 @@
 #include "monster-floor/monster-lite-util.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "util/bit-flags-calculator.h"
 
 monster_lite_type *initialize_monster_lite_type(BIT_FLAGS grid_info, monster_lite_type *ml_ptr, MonsterEntity *m_ptr)

diff --git a/src/monster-floor/monster-lite.cpp b/src/monster-floor/monster-lite.cpp
index 3e7042a..6cfec08 100644 (file)
--- a/src/monster-floor/monster-lite.cpp
+++ b/src/monster-floor/monster-lite.cpp
@@ -14,8 +14,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/point-2d.h"
 #include "view/display-messages.h"

diff --git a/src/monster-floor/monster-move.cpp b/src/monster-floor/monster-move.cpp
index f3930f0..33fe8e6 100644 (file)
--- a/src/monster-floor/monster-move.cpp
+++ b/src/monster-floor/monster-move.cpp
@@ -36,8 +36,8 @@
 #include "player/player-status-flags.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp
index cf80825..73a5063 100644 (file)
--- a/src/monster-floor/monster-object.cpp
+++ b/src/monster-floor/monster-object.cpp
@@ -25,8 +25,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/monster-floor/monster-remover.cpp b/src/monster-floor/monster-remover.cpp
index 12786b0..ebbc7d4 100644 (file)
--- a/src/monster-floor/monster-remover.cpp
+++ b/src/monster-floor/monster-remover.cpp
@@ -14,8 +14,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 

diff --git a/src/monster-floor/monster-runaway.cpp b/src/monster-floor/monster-runaway.cpp
index e2d5f64..7f2a32c 100644 (file)
--- a/src/monster-floor/monster-runaway.cpp
+++ b/src/monster-floor/monster-runaway.cpp
@@ -20,8 +20,8 @@
 #include "monster/monster-processor-util.h"
 #include "pet/pet-fall-off.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/monster-floor/monster-safety-hiding.cpp b/src/monster-floor/monster-safety-hiding.cpp
index 22297d3..b86d389 100644 (file)
--- a/src/monster-floor/monster-safety-hiding.cpp
+++ b/src/monster-floor/monster-safety-hiding.cpp
@@ -16,8 +16,8 @@
 #include "mspell/mspell-checker.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 

diff --git a/src/monster-floor/monster-summon.cpp b/src/monster-floor/monster-summon.cpp
index c10a523..ea4fd11 100644 (file)
--- a/src/monster-floor/monster-summon.cpp
+++ b/src/monster-floor/monster-summon.cpp
@@ -18,8 +18,8 @@
 #include "spell/summon-types.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/monster-floor/monster-sweep-grid.cpp b/src/monster-floor/monster-sweep-grid.cpp
index 812ec43..f8166c0 100644 (file)
--- a/src/monster-floor/monster-sweep-grid.cpp
+++ b/src/monster-floor/monster-sweep-grid.cpp
@@ -23,8 +23,8 @@
 #include "player/player-status-flags.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/monster-floor/quantum-effect.cpp b/src/monster-floor/quantum-effect.cpp
index dd24ab3..608015d 100644 (file)
--- a/src/monster-floor/quantum-effect.cpp
+++ b/src/monster-floor/quantum-effect.cpp
@@ -14,8 +14,8 @@
 #include "mspell/mspell-result.h"
 #include "spell-kind/spells-teleport.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp
index 186e7c8..00ca7e4 100644 (file)
--- a/src/monster-floor/special-death-switcher.cpp
+++ b/src/monster-floor/special-death-switcher.cpp
@@ -39,8 +39,8 @@
 #include "system/baseitem-info-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"

diff --git a/src/monster/monster-compaction.cpp b/src/monster/monster-compaction.cpp
index c3c8ce5..c15ad50 100644 (file)
--- a/src/monster/monster-compaction.cpp
+++ b/src/monster/monster-compaction.cpp
@@ -12,8 +12,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-damage.cpp b/src/monster/monster-damage.cpp
index 8373065..0069aa8 100644 (file)
--- a/src/monster/monster-damage.cpp
+++ b/src/monster/monster-damage.cpp
@@ -4,8 +4,7 @@
  * @author Hourier
  */
 
-#include <algorithm>
-
+#include "monster/monster-damage.h"
 #include "avatar/avatar-changer.h"
 #include "core/player-redraw-types.h"
 #include "core/speed-table.h"
@@ -29,7 +28,6 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
-#include "monster/monster-damage.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
@@ -41,14 +39,15 @@
 #include "spell-kind/spells-random.h"
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 #include "world/world.h"
+#include <algorithm>
 
 /*
  * @brief コンストラクタ

diff --git a/src/monster/monster-describer.cpp b/src/monster/monster-describer.cpp
index 8671e3d..a541848 100644 (file)
--- a/src/monster/monster-describer.cpp
+++ b/src/monster/monster-describer.cpp
@@ -7,8 +7,8 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/monster/monster-info.cpp b/src/monster/monster-info.cpp
index 13b2ff7..feb3030 100644 (file)
--- a/src/monster/monster-info.cpp
+++ b/src/monster/monster-info.cpp
@@ -28,8 +28,8 @@
 #include "player/player-status-flags.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "timed-effect/player-hallucination.h"

diff --git a/src/monster/monster-list.cpp b/src/monster/monster-list.cpp
index a95bfe5..ecad614 100644 (file)
--- a/src/monster/monster-list.cpp
+++ b/src/monster/monster-list.cpp
@@ -38,8 +38,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/probability-table.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-processor-util.cpp b/src/monster/monster-processor-util.cpp
index e53e5b6..a483535 100644 (file)
--- a/src/monster/monster-processor-util.cpp
+++ b/src/monster/monster-processor-util.cpp
@@ -10,8 +10,8 @@
 #include "monster/monster-processor-util.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-status.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 
 /*!
  * @brief ターン経過フラグ構造体の初期化

diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp
index 5b1eb3d..686696a 100644 (file)
--- a/src/monster/monster-processor.cpp
+++ b/src/monster/monster-processor.cpp
@@ -62,8 +62,8 @@
 #include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-status-setter.cpp b/src/monster/monster-status-setter.cpp
index 035a4b9..222e4f4 100644 (file)
--- a/src/monster/monster-status-setter.cpp
+++ b/src/monster/monster-status-setter.cpp
@@ -21,8 +21,8 @@
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/monster/monster-status.cpp b/src/monster/monster-status.cpp
index 262a338..f4f6c31 100644 (file)
--- a/src/monster/monster-status.cpp
+++ b/src/monster/monster-status.cpp
@@ -19,8 +19,8 @@
 #include "monster/monster-status-setter.h" //!< @todo 相互依存. 後で何とかする.
 #include "monster/monster-update.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/player-hallucination.h"

diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp
index b4c5d55..d842d45 100644 (file)
--- a/src/monster/monster-update.cpp
+++ b/src/monster/monster-update.cpp
@@ -37,8 +37,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/mspell/improper-mspell-remover.cpp b/src/mspell/improper-mspell-remover.cpp
index 20c8622..47cebfd 100644 (file)
--- a/src/mspell/improper-mspell-remover.cpp
+++ b/src/mspell/improper-mspell-remover.cpp
@@ -7,8 +7,8 @@
 #include "mspell/high-resistance-checker.h"
 #include "mspell/smart-mspell-util.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 static void add_cheat_remove_flags(PlayerType *player_ptr, msr_type *msr_ptr)

diff --git a/src/mspell/mspell-attack-util.cpp b/src/mspell/mspell-attack-util.cpp
index 50c3748..06f427c 100644 (file)
--- a/src/mspell/mspell-attack-util.cpp
+++ b/src/mspell/mspell-attack-util.cpp
@@ -1,8 +1,8 @@
 #include "mspell/mspell-attack-util.h"
 #include "monster-race/monster-race.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 msa_type *initialize_msa_type(PlayerType *player_ptr, msa_type *msa_ptr, MONSTER_IDX m_idx)

diff --git a/src/mspell/mspell-attack.cpp b/src/mspell/mspell-attack.cpp
index 6dbe5eb..3168398 100644 (file)
--- a/src/mspell/mspell-attack.cpp
+++ b/src/mspell/mspell-attack.cpp
@@ -30,8 +30,8 @@
 #include "spell-realm/spells-hex.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/mspell/mspell-attack/mspell-ball.cpp b/src/mspell/mspell-attack/mspell-ball.cpp
index e9f3a1f..2e7e097 100644 (file)
--- a/src/mspell/mspell-attack/mspell-ball.cpp
+++ b/src/mspell/mspell-attack/mspell-ball.cpp
@@ -15,7 +15,7 @@
 #include "mspell/mspell-result.h"
 #include "mspell/mspell-util.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-attack/mspell-breath.cpp b/src/mspell/mspell-attack/mspell-breath.cpp
index 890640f..251e473 100644 (file)
--- a/src/mspell/mspell-attack/mspell-breath.cpp
+++ b/src/mspell/mspell-attack/mspell-breath.cpp
@@ -15,7 +15,7 @@
 #include "mspell/mspell-result.h"
 #include "mspell/mspell-util.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index 91bd2e1..0daccf7 100644 (file)
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -50,8 +50,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/mspell/mspell-damage-calculator.cpp b/src/mspell/mspell-damage-calculator.cpp
index 05b9462..13c4790 100644 (file)
--- a/src/mspell/mspell-damage-calculator.cpp
+++ b/src/mspell/mspell-damage-calculator.cpp
@@ -8,8 +8,8 @@
 #include "player-info/equipment-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/mspell/mspell-floor.cpp b/src/mspell/mspell-floor.cpp
index 2409c42..ab9378d 100644 (file)
--- a/src/mspell/mspell-floor.cpp
+++ b/src/mspell/mspell-floor.cpp
@@ -38,8 +38,8 @@
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-judgement.cpp b/src/mspell/mspell-judgement.cpp
index f489c3b..361e8f9 100644 (file)
--- a/src/mspell/mspell-judgement.cpp
+++ b/src/mspell/mspell-judgement.cpp
@@ -34,8 +34,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 

diff --git a/src/mspell/mspell-learn-checker.cpp b/src/mspell/mspell-learn-checker.cpp
index 3ad3794..0332ae2 100644 (file)
--- a/src/mspell/mspell-learn-checker.cpp
+++ b/src/mspell/mspell-learn-checker.cpp
@@ -2,7 +2,7 @@
 #include "floor/cave.h"
 #include "grid/grid.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-lite.cpp b/src/mspell/mspell-lite.cpp
index 83f4a15..f1f54fe 100644 (file)
--- a/src/mspell/mspell-lite.cpp
+++ b/src/mspell/mspell-lite.cpp
@@ -21,8 +21,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/mspell/mspell-selector.cpp b/src/mspell/mspell-selector.cpp
index 0b7ec6a..52b4861 100644 (file)
--- a/src/mspell/mspell-selector.cpp
+++ b/src/mspell/mspell-selector.cpp
@@ -15,8 +15,8 @@
 #include "mspell/mspell-judgement.h"
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include "world/world.h"

diff --git a/src/mspell/mspell-special.cpp b/src/mspell/mspell-special.cpp
index c6963b1..2d01606 100644 (file)
--- a/src/mspell/mspell-special.cpp
+++ b/src/mspell/mspell-special.cpp
@@ -32,8 +32,8 @@
 #include "spell-realm/spells-crusade.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-status.cpp b/src/mspell/mspell-status.cpp
index a931c9c..cebca6d 100644 (file)
--- a/src/mspell/mspell-status.cpp
+++ b/src/mspell/mspell-status.cpp
@@ -32,8 +32,8 @@
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-summon.cpp b/src/mspell/mspell-summon.cpp
index 5c32b01..bd5df63 100644 (file)
--- a/src/mspell/mspell-summon.cpp
+++ b/src/mspell/mspell-summon.cpp
@@ -21,8 +21,8 @@
 #include "spell/spells-summon.h"
 #include "spell/summon-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/mspell-util.cpp b/src/mspell/mspell-util.cpp
index 2abfec4..2b5daa7 100644 (file)
--- a/src/mspell/mspell-util.cpp
+++ b/src/mspell/mspell-util.cpp
@@ -4,7 +4,7 @@
 #include "grid/grid.h"
 #include "monster/monster-info.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/mspell/smart-mspell-util.cpp b/src/mspell/smart-mspell-util.cpp
index e43a047..729ee5a 100644 (file)
--- a/src/mspell/smart-mspell-util.cpp
+++ b/src/mspell/smart-mspell-util.cpp
@@ -4,8 +4,8 @@
 #include "monster-race/race-flags2.h"
 #include "monster/smart-learn-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 msr_type *initialize_msr_type(PlayerType *player_ptr, msr_type *msr_ptr, MONSTER_IDX m_idx, const EnumClassFlagGroup<MonsterAbilityType> &ability_flags)

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index d3286ab..50ece12 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -44,8 +44,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-setter.h"

diff --git a/src/mutation/mutation-techniques.cpp b/src/mutation/mutation-techniques.cpp
index 6b32849..b40dbbb 100644 (file)
--- a/src/mutation/mutation-techniques.cpp
+++ b/src/mutation/mutation-techniques.cpp
@@ -14,7 +14,7 @@
 #include "player/player-status.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-getter.h"

diff --git a/src/object-activation/activation-others.cpp b/src/object-activation/activation-others.cpp
index 30ab5a0..afc6590 100644 (file)
--- a/src/object-activation/activation-others.cpp
+++ b/src/object-activation/activation-others.cpp
@@ -49,8 +49,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/object-enchant/vorpal-weapon.cpp b/src/object-enchant/vorpal-weapon.cpp
index 98abcc5..43007bd 100644 (file)
--- a/src/object-enchant/vorpal-weapon.cpp
+++ b/src/object-enchant/vorpal-weapon.cpp
@@ -8,8 +8,8 @@
 #include "monster-race/race-flags-resistance.h"
 #include "player-attack/player-attack-util.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/object-use/throw-execution.cpp b/src/object-use/throw-execution.cpp
index 1aaab46..290fe18 100644 (file)
--- a/src/object-use/throw-execution.cpp
+++ b/src/object-use/throw-execution.cpp
@@ -57,7 +57,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-getter.h"

diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index e2bbf92..ee0af33 100644 (file)
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -31,8 +31,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "timed-effect/player-blindness.h"

diff --git a/src/pet/pet-fall-off.cpp b/src/pet/pet-fall-off.cpp
index 21388f8..9eb358f 100644 (file)
--- a/src/pet/pet-fall-off.cpp
+++ b/src/pet/pet-fall-off.cpp
@@ -22,8 +22,8 @@
 #include "player/player-skill.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/pet/pet-util.cpp b/src/pet/pet-util.cpp
index b4bb415..896723b 100644 (file)
--- a/src/pet/pet-util.cpp
+++ b/src/pet/pet-util.cpp
@@ -10,8 +10,8 @@
 #include "player-info/class-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "world/world.h"

diff --git a/src/player-attack/attack-chaos-effect.cpp b/src/player-attack/attack-chaos-effect.cpp
index 76e00c7..a0a70b5 100644 (file)
--- a/src/player-attack/attack-chaos-effect.cpp
+++ b/src/player-attack/attack-chaos-effect.cpp
@@ -34,8 +34,8 @@
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/player-attack/blood-sucking-processor.cpp b/src/player-attack/blood-sucking-processor.cpp
index 24a85ce..62fb32b 100644 (file)
--- a/src/player-attack/blood-sucking-processor.cpp
+++ b/src/player-attack/blood-sucking-processor.cpp
@@ -15,7 +15,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell-realm/spells-hex.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/player-attack/player-attack.cpp b/src/player-attack/player-attack.cpp
index b299f83..0cebcc2 100644 (file)
--- a/src/player-attack/player-attack.cpp
+++ b/src/player-attack/player-attack.cpp
@@ -52,8 +52,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-cut.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player-info/alignment.cpp b/src/player-info/alignment.cpp
index 3b1de66..bc45a3f 100644 (file)
--- a/src/player-info/alignment.cpp
+++ b/src/player-info/alignment.cpp
@@ -11,8 +11,8 @@
 #include "player-info/race-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index 5a3de22..934e337 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -25,8 +25,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-deceleration.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player/eldritch-horror.cpp b/src/player/eldritch-horror.cpp
index f134af8..70911c4 100644 (file)
--- a/src/player/eldritch-horror.cpp
+++ b/src/player/eldritch-horror.cpp
@@ -27,8 +27,8 @@
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index 8707787..2554fbd 100644 (file)
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -61,8 +61,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index 9125f4e..a6fdadc 100644 (file)
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -43,7 +43,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/player/player-skill.cpp b/src/player/player-skill.cpp
index 30184c0..06efddc 100644 (file)
--- a/src/player/player-skill.cpp
+++ b/src/player/player-skill.cpp
@@ -8,8 +8,8 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index 10df0f4..f9c05cf 100644 (file)
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -42,8 +42,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-blindness.h"
 #include "timed-effect/timed-effects.h"

diff --git a/src/player/player-status-resist.cpp b/src/player/player-status-resist.cpp
index c5a8d15..08bf789 100644 (file)
--- a/src/player/player-status-resist.cpp
+++ b/src/player/player-status-resist.cpp
@@ -26,7 +26,7 @@
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 67e096e..91382e8 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -106,8 +106,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp
index 20567ae..00b05b1 100644 (file)
--- a/src/realm/realm-hissatsu.cpp
+++ b/src/realm/realm-hissatsu.cpp
@@ -45,8 +45,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/room/rooms-pit-nest.cpp b/src/room/rooms-pit-nest.cpp
index b7fd7e5..1509747 100644 (file)
--- a/src/room/rooms-pit-nest.cpp
+++ b/src/room/rooms-pit-nest.cpp
@@ -22,8 +22,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/probability-table.h"
 #include "util/sort.h"

diff --git a/src/save/monster-writer.cpp b/src/save/monster-writer.cpp
index eabddb9..5972dfc 100644 (file)
--- a/src/save/monster-writer.cpp
+++ b/src/save/monster-writer.cpp
@@ -4,8 +4,8 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "save/save-util.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/quarks.h"

diff --git a/src/specific-object/monster-ball.cpp b/src/specific-object/monster-ball.cpp
index bcac9ba..2c5bf56 100644 (file)
--- a/src/specific-object/monster-ball.cpp
+++ b/src/specific-object/monster-ball.cpp
@@ -15,8 +15,8 @@
 #include "spell-kind/spells-launcher.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "util/flag-group.h"

diff --git a/src/spell-class/spells-mirror-master.cpp b/src/spell-class/spells-mirror-master.cpp
index 0f38683..38dd9a5 100644 (file)
--- a/src/spell-class/spells-mirror-master.cpp
+++ b/src/spell-class/spells-mirror-master.cpp
@@ -30,7 +30,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/grid-selector.h"

diff --git a/src/spell-kind/blood-curse.cpp b/src/spell-kind/blood-curse.cpp
index ab5911b..e4f94a9 100644 (file)
--- a/src/spell-kind/blood-curse.cpp
+++ b/src/spell-kind/blood-curse.cpp
@@ -14,7 +14,7 @@
 #include "status/experience.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/earthquake.cpp b/src/spell-kind/earthquake.cpp
index 49f427d..d86e8f4 100644 (file)
--- a/src/spell-kind/earthquake.cpp
+++ b/src/spell-kind/earthquake.cpp
@@ -33,8 +33,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell-kind/spells-fetcher.cpp b/src/spell-kind/spells-fetcher.cpp
index 4ffb3f2..d3c367e 100644 (file)
--- a/src/spell-kind/spells-fetcher.cpp
+++ b/src/spell-kind/spells-fetcher.cpp
@@ -16,8 +16,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index eee31e6..fd32e4a 100644 (file)
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -49,8 +49,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell-kind/spells-genocide.cpp b/src/spell-kind/spells-genocide.cpp
index 2d62e9b..abd4966 100644 (file)
--- a/src/spell-kind/spells-genocide.cpp
+++ b/src/spell-kind/spells-genocide.cpp
@@ -25,8 +25,8 @@
 #include "monster/monster-status.h"
 #include "player/player-damage.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"

diff --git a/src/spell-kind/spells-lite.cpp b/src/spell-kind/spells-lite.cpp
index 495728c..0013a6b 100644 (file)
--- a/src/spell-kind/spells-lite.cpp
+++ b/src/spell-kind/spells-lite.cpp
@@ -20,8 +20,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/spell-kind/spells-pet.cpp b/src/spell-kind/spells-pet.cpp
index 5bc033a..4a1a33b 100644 (file)
--- a/src/spell-kind/spells-pet.cpp
+++ b/src/spell-kind/spells-pet.cpp
@@ -13,8 +13,8 @@
 #include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-polymorph.cpp b/src/spell-kind/spells-polymorph.cpp
index 16ae3f9..899234d 100644 (file)
--- a/src/spell-kind/spells-polymorph.cpp
+++ b/src/spell-kind/spells-polymorph.cpp
@@ -14,8 +14,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell-kind/spells-sight.cpp b/src/spell-kind/spells-sight.cpp
index 8ff1967..1e79a58 100644 (file)
--- a/src/spell-kind/spells-sight.cpp
+++ b/src/spell-kind/spells-sight.cpp
@@ -25,8 +25,8 @@
 #include "monster/monster-status.h"
 #include "monster/smart-learn-types.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "term/screen-processor.h"

diff --git a/src/spell-kind/spells-teleport.cpp b/src/spell-kind/spells-teleport.cpp
index 8ffed6e..efb4213 100644 (file)
--- a/src/spell-kind/spells-teleport.cpp
+++ b/src/spell-kind/spells-teleport.cpp
@@ -36,8 +36,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/grid-selector.h"
 #include "target/target-checker.h"

diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index 726c4f8..e219e2c 100644 (file)
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -30,8 +30,8 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "target/target-checker.h"

diff --git a/src/spell-realm/spells-chaos.cpp b/src/spell-realm/spells-chaos.cpp
index 8e729ba..b04cbf5 100644 (file)
--- a/src/spell-realm/spells-chaos.cpp
+++ b/src/spell-realm/spells-chaos.cpp
@@ -19,7 +19,7 @@
 #include "spell-kind/spells-launcher.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index 07ca990..d38656c 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -20,8 +20,8 @@
 #include "spell/technic-info-table.h"
 #include "status/action-setter.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/spell/spell-info.cpp b/src/spell/spell-info.cpp
index 931aef7..129d3fb 100644 (file)
--- a/src/spell/spell-info.cpp
+++ b/src/spell/spell-info.cpp
@@ -10,8 +10,8 @@
 #include "realm/realm-types.h"
 #include "spell/spells-execution.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/spell/spells-diceroll.cpp b/src/spell/spells-diceroll.cpp
index 8f61f77..29fe241 100644 (file)
--- a/src/spell/spells-diceroll.cpp
+++ b/src/spell/spells-diceroll.cpp
@@ -12,8 +12,8 @@
 #include "player/player-status-table.h"
 #include "room/rooms-builder.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!

diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index 80788dd..4397748 100644 (file)
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -48,7 +48,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-getter.h"
 #include "timed-effect/player-acceleration.h"

diff --git a/src/spell/spells-summon.cpp b/src/spell/spells-summon.cpp
index c5816eb..b5af2f7 100644 (file)
--- a/src/spell/spells-summon.cpp
+++ b/src/spell/spells-summon.cpp
@@ -29,8 +29,8 @@
 #include "sv-definition/sv-other-types.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/projection-path-calculator.h"
 #include "util/string-processor.h"

diff --git a/src/system/monster-type-definition.cpp b/src/system/monster-entity.cpp
similarity index 98%
rename from src/system/monster-type-definition.cpp
rename to src/system/monster-entity.cpp
index 73bef70..d0c2031 100644 (file)
--- a/src/system/monster-type-definition.cpp
+++ b/src/system/monster-entity.cpp
@@ -1,4 +1,4 @@
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "game-option/birth-options.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"

diff --git a/src/system/monster-type-definition.h b/src/system/monster-entity.h
similarity index 100%
rename from src/system/monster-type-definition.h
rename to src/system/monster-entity.h

diff --git a/src/target/target-checker.cpp b/src/target/target-checker.cpp
index 2d23d20..c0a57b0 100644 (file)
--- a/src/target/target-checker.cpp
+++ b/src/target/target-checker.cpp
@@ -19,7 +19,7 @@
 #include "io/cursor.h"
 #include "io/screen-util.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "target/target-preparation.h"
 #include "target/target-types.h"

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 6c26440..3fc80f8 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -30,8 +30,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"
 #include "system/terrain-type-definition.h"

diff --git a/src/target/target-getter.cpp b/src/target/target-getter.cpp
index 93adce8..75dc8bf 100644 (file)
--- a/src/target/target-getter.cpp
+++ b/src/target/target-getter.cpp
@@ -11,8 +11,8 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-setter.h"

diff --git a/src/target/target-preparation.cpp b/src/target/target-preparation.cpp
index c43c9d9..53f74a7 100644 (file)
--- a/src/target/target-preparation.cpp
+++ b/src/target/target-preparation.cpp
@@ -11,8 +11,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"

diff --git a/src/util/sort.cpp b/src/util/sort.cpp
index 0c77009..7924edc 100644 (file)
--- a/src/util/sort.cpp
+++ b/src/util/sort.cpp
@@ -8,8 +8,8 @@
 #include "system/artifact-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 

diff --git a/src/view/display-lore-status.cpp b/src/view/display-lore-status.cpp
index 29b7c57..cc8ad67 100644 (file)
--- a/src/view/display-lore-status.cpp
+++ b/src/view/display-lore-status.cpp
@@ -8,8 +8,8 @@
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "term/term-color-types.h"
 
 void display_monster_hp_ac(lore_type *lore_ptr)

diff --git a/src/view/display-map.cpp b/src/view/display-map.cpp
index c1ed48f..484610b 100644 (file)
--- a/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@ -17,8 +17,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/term-color-types.h"

diff --git a/src/view/display-monster-status.cpp b/src/view/display-monster-status.cpp
index 9ca479c..42e0452 100644 (file)
--- a/src/view/display-monster-status.cpp
+++ b/src/view/display-monster-status.cpp
@@ -4,8 +4,8 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 
 /*
  * Monster health description

diff --git a/src/view/display-player-middle.cpp b/src/view/display-player-middle.cpp
index 458e541..aeba027 100644 (file)
--- a/src/view/display-player-middle.cpp
+++ b/src/view/display-player-middle.cpp
@@ -21,7 +21,7 @@
 #include "sv-definition/sv-bow-types.h"
 #include "system/floor-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "term/term-color-types.h"
 #include "timed-effect/player-deceleration.h"

diff --git a/src/window/display-sub-windows.cpp b/src/window/display-sub-windows.cpp
index f973882..d9f2016 100644 (file)
--- a/src/window/display-sub-windows.cpp
+++ b/src/window/display-sub-windows.cpp
@@ -26,8 +26,8 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/target-describer.h"

diff --git a/src/window/main-window-left-frame.cpp b/src/window/main-window-left-frame.cpp
index 366b889..ad946a1 100644 (file)
--- a/src/window/main-window-left-frame.cpp
+++ b/src/window/main-window-left-frame.cpp
@@ -9,8 +9,8 @@
 #include "player-info/mimic-info-table.h"
 #include "player/player-status-table.h"
 #include "system/floor-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/monster-race-info.h"
-#include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/window/main-window-stat-poster.cpp b/src/window/main-window-stat-poster.cpp
index ae81e9a..fbba995 100644 (file)
--- a/src/window/main-window-stat-poster.cpp
+++ b/src/window/main-window-stat-poster.cpp
@@ -18,7 +18,7 @@
 #include "spell-realm/spells-hex.h"
 #include "status/element-resistance.h"
 #include "system/floor-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 0195136..47906cb 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -85,7 +85,7 @@
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/grid-selector.h"

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index 854912f..2373426 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -32,7 +32,7 @@
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "term/screen-processor.h"