[Refactor] #38862 Moved monster*.c/h to monster/ except for monster-spell.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 371862a..b97f34f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -298,11 +298,11 @@
     <ClCompile Include="..\..\src\market\store-owner-comments.c" />\r
     <ClCompile Include="..\..\src\market\store-owners.c" />\r
     <ClCompile Include="..\..\src\market\store-util.c" />\r
-    <ClCompile Include="..\..\src\monster-dist-offsets.c" />\r
-    <ClCompile Include="..\..\src\monster-process.c" />\r
-    <ClCompile Include="..\..\src\monster-status.c" />\r
-    <ClCompile Include="..\..\src\monsterrace-hook.c" />\r
-    <ClCompile Include="..\..\src\monsterrace.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-dist-offsets.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-process.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-status.c" />\r
+    <ClCompile Include="..\..\src\monster\monsterrace-hook.c" />\r
+    <ClCompile Include="..\..\src\monster\monsterrace.c" />\r
     <ClCompile Include="..\..\src\monster\monster-attack.c" />\r
     <ClCompile Include="..\..\src\monster\monster-direction.c" />\r
     <ClCompile Include="..\..\src\monster\monster-move.c" />\r
@@ -451,8 +451,8 @@
     <ClCompile Include="..\..\src\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
     <ClCompile Include="..\..\src\mind.c" />\r
-    <ClCompile Include="..\..\src\monster1.c" />\r
-    <ClCompile Include="..\..\src\monster2.c" />\r
+    <ClCompile Include="..\..\src\monster\monster1.c" />\r
+    <ClCompile Include="..\..\src\monster\monster2.c" />\r
     <ClCompile Include="..\..\src\mspells1.c" />\r
     <ClCompile Include="..\..\src\mspells2.c" />\r
     <ClCompile Include="..\..\src\mspells3.c" />\r
@@ -576,7 +576,7 @@
     <ClInclude Include="..\..\src\market\store-owner-comments.h" />\r
     <ClInclude Include="..\..\src\market\store-owners.h" />\r
     <ClInclude Include="..\..\src\market\store-util.h" />\r
-    <ClInclude Include="..\..\src\monster-dist-offsets.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-dist-offsets.h" />\r
     <ClInclude Include="..\..\src\monster\monster-attack.h" />\r
     <ClInclude Include="..\..\src\monster\monster-direction.h" />\r
     <ClInclude Include="..\..\src\monster\monster-move.h" />\r
@@ -649,12 +649,12 @@
     <ClInclude Include="..\..\src\init.h" />\r
     <ClInclude Include="..\..\src\load.h" />\r
     <ClInclude Include="..\..\src\mind.h" />\r
-    <ClInclude Include="..\..\src\monster-process.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-process.h" />\r
     <ClInclude Include="..\..\src\monster-spell.h" />\r
-    <ClInclude Include="..\..\src\monster-status.h" />\r
-    <ClInclude Include="..\..\src\monster.h" />\r
-    <ClInclude Include="..\..\src\monsterrace-hook.h" />\r
-    <ClInclude Include="..\..\src\monsterrace.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-status.h" />\r
+    <ClInclude Include="..\..\src\monster\monster.h" />\r
+    <ClInclude Include="..\..\src\monster\monsterrace-hook.h" />\r
+    <ClInclude Include="..\..\src\monster\monsterrace.h" />\r
     <ClInclude Include="..\..\src\mutation\mutation.h" />\r
     <ClInclude Include="..\..\src\object\object-boost.h" />\r
     <ClInclude Include="..\..\src\object\object-curse.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 10feff1..0901cfe 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -39,21 +39,6 @@
     <ClCompile Include="..\..\src\feature.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monster1.c">
-      <Filter>monster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\monster2.c">
-      <Filter>monster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\monster-process.c">
-      <Filter>monster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\monsterrace-hook.c">
-      <Filter>monster</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\monster-status.c">
-      <Filter>monster</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\files.c">
       <Filter>io</Filter>
@@ -91,9 +76,6 @@
     <ClCompile Include="..\..\src\mind.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monsterrace.c">
-      <Filter>monster</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\history.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -208,9 +190,6 @@
     <ClCompile Include="..\..\src\combat\shoot.c">
       <Filter>combat</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monster-dist-offsets.c">
-      <Filter>monster</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\horror-descriptions.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -829,6 +808,27 @@
     <ClCompile Include="..\..\src\player\player-status.c">
       <Filter>player</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster1.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster2.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-dist-offsets.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-process.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monsterrace.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monsterrace-hook.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-status.c">
+      <Filter>monster</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -875,18 +875,6 @@
     <ClInclude Include="..\..\src\feature.h">
       <Filter>floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster.h">
-      <Filter>monster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\monsterrace-hook.h">
-      <Filter>monster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\monster-status.h">
-      <Filter>monster</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\monster-process.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\files.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -908,9 +896,6 @@
     <ClInclude Include="..\..\src\mind.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monsterrace.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\angband.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -1037,9 +1022,6 @@
     <ClInclude Include="..\..\src\combat\shoot.h">
       <Filter>combat</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster-dist-offsets.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\horror-descriptions.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -1691,6 +1673,24 @@
     <ClInclude Include="..\..\src\player\player-status.h">
       <Filter>player</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-dist-offsets.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-process.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monsterrace.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monsterrace-hook.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-status.h">
+      <Filter>monster</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index fbf5072..aa4f6a6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,7 +120,7 @@ hengband_SOURCES = \
        main.c main-x11.c main-gcu.c \
        mind.c mind.h \
        \
-       monster.h monsterrace.c monsterrace.h \
+       monster/monster.h monster/monsterrace.c monster/monsterrace.h \
        monster/monster-util.c monster/monster-util.h \
        monster/monster-direction.c monster/monster-direction.h \
        monster/monster-attack.c monster/monster-attack.h \
@@ -131,11 +131,13 @@ hengband_SOURCES = \
        monster/monster-sweep-grid.c monster/monster-sweep-grid.h \
        monster/monster-update.c monster/monster-update.h \
        monster/quantum-effect.c monster/quantum-effect.h \
-       monsterrace-hook.c monsterrace-hook.h \
-       monster-dist-offsets.c monster-dist-offsets.h \
-       monster-process.c monster-process.h \
-       monster-status.c monster-status.h monster1.c monster2.c \
-       mspells1.c mspells2.c mspells3.c mspells4.c monster-spell.h \
+       monster/monsterrace-hook.c monster/monsterrace-hook.h \
+       monster/monster-dist-offsets.c monster/monster-dist-offsets.h \
+       monster/monster-process.c monster/monster-process.h \
+       monster/monster-status.c monster/monster-status.h \
+       monster/monster1.c monster/monster2.c \
+       monster/mspells1.c monster/mspells2.c monster/mspells3.c monster/mspells4.c \
+       monster/monster-spell.h \
        \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
@@ -159,12 +161,12 @@ hengband_SOURCES = \
        patron.h patron.c \
        \
        creature.h creature.c \
-       player-move.c player-move.h player-damage.c player-damage.h \
+       player/player-move.c player/player-move.h player/player-damage.c player/player-damage.h \
        horror-descriptions.c horror-descriptions.h \
-       player-status.c player-status.h player-effects.c player-effects.h \
-       player-skill.c player-skill.h player-class.c player-class.h \
-       player-race.c player-race.h player-personality.c player-personality.h \
-       player-sex.c player-sex.h player-inventory.c player-inventory.h \
+       player/player-status.c player/player-status.h player/player-effects.c player/player-effects.h \
+       player/player-skill.c player/player-skill.h player/player-class.c player/player-class.h \
+       player/player-race.c player/player-race.h player/player-personality.c player/player-personality.h \
+       player/player-sex.c player/player-sex.h player/player-inventory.c player/player-inventory.h \
        \
        quest.h quest.c\
        \

diff --git a/src/angband.h b/src/angband.h
index 7760193..d8e8df2 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -39,8 +39,8 @@
 #include "gamevalue.h"
 #include "cmd-gameoption.h"
 
-#include "monster.h"
-#include "monsterrace.h"
+#include "monster/monster.h"
+#include "monster/monsterrace.h"
 #include "object/object.h"
 #include "player/player-status.h"
 

diff --git a/src/artifact.c b/src/artifact.c
index b51560c..dcf9bd1 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -29,7 +29,7 @@
 #include "spells-object.h"
 #include "files.h"
 #include "grid.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"

diff --git a/src/birth/birth.c b/src/birth/birth.c
index f31e8eb..23fb188 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -37,9 +37,9 @@
 #include "io/write-diary.h"
 #include "japanese.h"
 #include "market/store.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
-#include "monsterrace.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monsterrace.h"
 #include "object/object-ego.h"
 #include "object/object-kind.h"
 #include "patron.h"

diff --git a/src/character-dump.c b/src/character-dump.c
index a9d0727..d4fe841 100644 (file)
--- a/src/character-dump.c
+++ b/src/character-dump.c
@@ -5,7 +5,7 @@
 #include "dungeon/dungeon.h"
 #include "market/store.h"
 #include "cmd/cmd-pet.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "sort.h"
 #include "quest.h"
 #include "init.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 0e76253..f4adf61 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -24,7 +24,7 @@
 #include "realm/realm-hex.h"
 #include "player/player-damage.h"
 #include "player-inventory.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "files.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 64a5921..ea7622e 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -25,7 +25,7 @@
 #include "dungeon/dungeon.h"
 #include "melee.h"
 #include "object/object-hook.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index b78f6f7..41d89f4 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player-inventory.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index d0e060c..3207fb7 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -38,7 +38,7 @@
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "view/display-main-window.h"
 #include "spell/spells3.h"
 #include "object/object-kind.h"

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 0c27ae1..86959b0 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -19,9 +19,9 @@
 #include "grid.h"
 #include "spells-summon.h"
 #include "spells-status.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
-#include "monster-process.h"
+#include "monster/monster-process.h"
 #include "cmd-spell.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 13c4259..fd7eba7 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -15,8 +15,8 @@
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "object/object-hook.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "cmd-pet.h"
 #include "cmd-basic.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index db7a244..a6f545c 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -6,7 +6,7 @@
 #include "core/stuff-handler.h"
 #include "save.h"
 #include "world/world.h"
-#include "monster-status.h" // 違和感。要調査.
+#include "monster/monster-status.h" // 違和感。要調査.
 #include "gameterm.h"
 
 /*!

diff --git a/src/combat/melee.c b/src/combat/melee.c
index fd55c4b..aa688a9 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -18,10 +18,10 @@
 
 #include "artifact.h"
 #include "cmd-pet.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "melee.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
 #include "avatar.h"
 #include "realm/realm-hex.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index a4cb31f..07c1421 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -4,8 +4,8 @@
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"
 
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
 #include "artifact.h"
 #include "avatar.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index 5ac215c..a56bb43 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-magiceat.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
 int wild_regen = 20;

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 35fa71f..b473b0e 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -5,7 +5,7 @@
 #include "core/special-internal-keys.h"
 #include "mutation/mutation.h"
 #include "spell/spells2.h" // 相互依存している。後でどうするか検討する.
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "view/display-main-window.h"
 #include "creature.h"
 #include "player/player-effects.h"
@@ -15,7 +15,7 @@
 #include "snipe.h"
 #include "realm/realm-hex.h"
 #include "spell/music-checker.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "wild.h"
 
 bool load = TRUE;

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index e0fac79..6943cf7 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -42,7 +42,7 @@
 #include "feature.h"
 #include "grid.h"
 #include "quest.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "files.h"
 #include "player/player-skill.h"
 #include "player/player-race.h"
@@ -53,7 +53,7 @@
 #include "room/rooms-vault.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "floor/floor-town.h"
 #include "realm/realm.h"
 

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index 790d2a2..4ff3e90 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -13,8 +13,8 @@
 #include "core/stuff-handler.h"
 #include "cmd/cmd-dump.h"
 #include "player/player-effects.h"
-#include "monster-process.h"
-#include "monster-status.h"
+#include "monster/monster-process.h"
+#include "monster/monster-status.h"
 #include "world/world-turn-processor.h"
 #include "core/turn-compensator.h"
 

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index 789f8ac..0f45f44 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -3,7 +3,7 @@
 #include "effect/effect-monster-charm.h"
 #include "avatar.h"
 #include "spells-diceroll.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 
 static void effect_monster_charm_resist(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index bf7398e..af999bd 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -3,11 +3,11 @@
 #include "effect/effect-monster-domination.h"
 #include "player/player-effects.h"
 #include "spells-diceroll.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "effect/spells-effect-util.h"
 #include "cmd/cmd-pet.h" // 暫定、後で消すかも.
 #include "quest.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 
 static void effect_monster_domination_corrupted_addition(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-evil.c b/src/effect/effect-monster-evil.c
index 87e89d3..b8bcc78 100644 (file)
--- a/src/effect/effect-monster-evil.c
+++ b/src/effect/effect-monster-evil.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-evil.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 
 static bool effect_monster_away_resist(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index c7e6cfc..4b6b7ee 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -2,7 +2,7 @@
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-oldies.h"
 #include "avatar.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 
 // Powerful monsters can resist.
 gf_switch_result effect_monster_old_poly(effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-resist-hurt.c b/src/effect/effect-monster-resist-hurt.c
index 05d4b37..fede5e6 100644 (file)
--- a/src/effect/effect-monster-resist-hurt.c
+++ b/src/effect/effect-monster-resist-hurt.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-resist-hurt.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "spell/spells3.h"
 
 gf_switch_result effect_monster_void(effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index 24bc0ae..691ec59 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -2,7 +2,7 @@
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-spirit.h"
 #include "monster-spell.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-effects.h"
 
 gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index f19ed6f..e456c57 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -11,8 +11,8 @@
 #include "effect/effect-monster-switcher.h"
 #include "player/player-damage.h"
 #include "avatar.h"
-#include "monster-status.h"
-#include "monsterrace-hook.h"
+#include "monster/monster-status.h"
+#include "monster/monsterrace-hook.h"
 #include "combat/melee.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 6070b60..03c0542 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -13,7 +13,7 @@
 #include "core/stuff-handler.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "avatar.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index d5ca9dd..ed92112 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -5,8 +5,8 @@
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "grid.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "quest.h"
 #include "object/object-hook.h"
 #include "player/player-move.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index a79c536..6885a8f 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -115,11 +115,11 @@
 #include "floor/floor-generate.h"
 #include "feature.h"
 #include "trap.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "quest.h"
 #include "player/player-status.h"
 #include "wild.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "dungeon/dungeon-file.h"
 #include "init.h"
 #include "feature.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 2d1238f..4ea45bd 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -25,11 +25,11 @@
 #include "feature.h"
 #include "geometry.h"
 #include "grid.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "quest.h"
 #include "wild.h"
 #include "spells-floor.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "cmd-pet.h"
 #include "cmd-basic.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 9ffc3dd..86f2e74 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -24,7 +24,7 @@
 #include "floor/floor.h"
 #include "floor/floor-streams.h"
 #include "grid.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "feature.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/grid.c b/src/grid.c
index c29b270..2c64e1c 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -27,10 +27,10 @@
 #include "grid.h"
 #include "trap.h"
 #include "room/rooms.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "quest.h"
 #include "feature.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index a0b2fdd..4f19109 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -10,7 +10,7 @@
 #include "cmd/dump-util.h"
 #include "sort.h"
 #include "cmd/monster-group-table.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "world/world.h"
 #include "core/show-file.h"
 #include "gameterm.h"

diff --git a/src/load.c b/src/load.c
index d4c4741..1b24e63 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -54,7 +54,7 @@
 #include "floor/floor-generate.h"
 #include "trap.h"
 #include "mutation/mutation.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "market/store-util.h"
 #include "quest.h"
 #include "market/store.h"

diff --git a/src/market/building.c b/src/market/building.c
index 3a67b4b..35aa0fc 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -31,8 +31,8 @@
 #include "object/object-boost.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "melee.h"
 #include "wild.h"
 #include "world/world.h"
@@ -60,7 +60,7 @@
 #include "scores.h"
 #include "shoot.h"
 #include "view/display-main-window.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "autopick/autopick.h"
 
 #include "market/poker.h"

diff --git a/src/mind.c b/src/mind.c
index 2200202..3f29e11 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -34,7 +34,7 @@
 #include "feature.h"
 #include "grid.h"
 #include "cmd-basic.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-effects.h"
 #include "player/player-damage.h"
 #include "view/display-main-window.h"

diff --git a/src/monster/monster-attack.c b/src/monster/monster-attack.c
index 9ea9dc2..8d24095 100644 (file)
--- a/src/monster/monster-attack.c
+++ b/src/monster/monster-attack.c
@@ -5,7 +5,7 @@
  */
 
 #include "monster/monster-attack.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "dungeon/dungeon.h"
 #include "combat/melee.h" // 暫定。後で引っ越し.
 

diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index 188005d..6a617b8 100644 (file)
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -7,7 +7,7 @@
 #include "monster/monster-direction.h"
 #include "monster/monster-sweep-grid.h"
 #include "monster/monster-util.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "cmd/cmd-pet.h"
 
 /*!

diff --git a/src/monster-dist-offsets.c b/src/monster/monster-dist-offsets.c
similarity index 98%
rename from src/monster-dist-offsets.c
rename to src/monster/monster-dist-offsets.c
index 7ced0ff..844246d 100644 (file)
--- a/src/monster-dist-offsets.c
+++ b/src/monster/monster-dist-offsets.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "monster-dist-offsets.h"
+#include "monster/monster-dist-offsets.h"
 
 /*
  * Hack -- Precompute a bunch of calls to distance() in find_safety() and

diff --git a/src/monster-dist-offsets.h b/src/monster/monster-dist-offsets.h
similarity index 100%
rename from src/monster-dist-offsets.h
rename to src/monster/monster-dist-offsets.h

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index be5646c..b92def1 100644 (file)
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -11,7 +11,7 @@
 #include "cmd/cmd-pet.h"
 #include "creature.h"
 #include "files.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"

diff --git a/src/monster-process.c b/src/monster/monster-process.c
similarity index 99%
rename from src/monster-process.c
rename to src/monster/monster-process.c
index 98e79df..2a79e13 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster/monster-process.c
@@ -33,9 +33,9 @@
 #include "feature.h"
 #include "grid.h"
 #include "player/player-move.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
-#include "monster-process.h"
+#include "monster/monster-process.h"
 
 void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon);
 bool process_stealth(player_type *target_ptr, MONSTER_IDX m_idx);

diff --git a/src/monster-process.h b/src/monster/monster-process.h
similarity index 100%
rename from src/monster-process.h
rename to src/monster/monster-process.h

diff --git a/src/monster/monster-safety-hiding.c b/src/monster/monster-safety-hiding.c
index e8c0801..aec36bb 100644 (file)
--- a/src/monster/monster-safety-hiding.c
+++ b/src/monster/monster-safety-hiding.c
@@ -5,7 +5,7 @@
  */
 
 #include "monster/monster-safety-hiding.h"
-#include "monster-dist-offsets.h"
+#include "monster/monster-dist-offsets.h"
 #include "monster-spell.h"
 
  /*!

diff --git a/src/monster-status.c b/src/monster/monster-status.c
similarity index 99%
rename from src/monster-status.c
rename to src/monster/monster-status.c
index e1ac463..6d5623a 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster/monster-status.c
@@ -11,13 +11,13 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "grid.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
-#include "monster-process.h"
+#include "monster/monster-process.h"
 #include "spell/spells2.h"
 #include "spells-summon.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-curse.h"
 #include "artifact.h"
 #include "avatar.h"

diff --git a/src/monster-status.h b/src/monster/monster-status.h
similarity index 100%
rename from src/monster-status.h
rename to src/monster/monster-status.h

diff --git a/src/monster.h b/src/monster/monster.h
similarity index 99%
rename from src/monster.h
rename to src/monster/monster.h
index fe60928..f7d52af 100644 (file)
--- a/src/monster.h
+++ b/src/monster/monster.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 
 typedef bool(*monsterrace_hook_type)(MONRACE_IDX r_idx);
 

diff --git a/src/monster1.c b/src/monster/monster1.c
similarity index 99%
rename from src/monster1.c
rename to src/monster/monster1.c
index 4df9a4c..5e0c0ae 100644 (file)
--- a/src/monster1.c
+++ b/src/monster/monster1.c
@@ -22,9 +22,9 @@
 #include "effect/effect-characteristics.h"
 #include "object/object-kind-hook.h"
 #include "player/player-personality.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "monster-spell.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "spells-summon.h"
 #include "patron.h"
 #include "quest.h"

diff --git a/src/monster2.c b/src/monster/monster2.c
similarity index 99%
rename from src/monster2.c
rename to src/monster/monster2.c
index d349b5e..d94856c 100644 (file)
--- a/src/monster2.c
+++ b/src/monster/monster2.c
@@ -21,9 +21,9 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-flavor.h"
-#include "monsterrace-hook.h"
-#include "monster-status.h"
-#include "monster.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monster-status.h"
+#include "monster/monster.h"
 #include "spell/spells-type.h"
 #include "spells-summon.h"
 #include "quest.h"
@@ -39,7 +39,7 @@
 #include "files.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "creature.h"
 #include "targeting.h"
 #include "melee.h"

diff --git a/src/monsterrace-hook.c b/src/monster/monsterrace-hook.c
similarity index 99%
rename from src/monsterrace-hook.c
rename to src/monster/monsterrace-hook.c
index 910bafa..313221d 100644 (file)
--- a/src/monsterrace-hook.c
+++ b/src/monster/monsterrace-hook.c
@@ -1,12 +1,12 @@
 #include "angband.h"
 #include "util.h"
 
-#include "monsterrace-hook.h"
-#include "monster.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monster.h"
 #include "monster-spell.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "melee.h"
 
 /*! 通常pit生成時のモンスターの構成条件ID / Race index for "monster pit (clone)" */

diff --git a/src/monsterrace-hook.h b/src/monster/monsterrace-hook.h
similarity index 100%
rename from src/monsterrace-hook.h
rename to src/monster/monsterrace-hook.h

diff --git a/src/monsterrace.c b/src/monster/monsterrace.c
similarity index 91%
rename from src/monsterrace.c
rename to src/monster/monsterrace.c
index c4923c9..d0502a3 100644 (file)
--- a/src/monsterrace.c
+++ b/src/monster/monsterrace.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "util.h"
 
 extern monster_race *r_info;

diff --git a/src/monsterrace.h b/src/monster/monsterrace.h
similarity index 100%
rename from src/monsterrace.h
rename to src/monster/monsterrace.h

diff --git a/src/mspells1.c b/src/mspells1.c
index b448ccb..3182966 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -49,7 +49,7 @@
 #include "realm/realm-hex.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "world/world.h"

diff --git a/src/mspells2.c b/src/mspells2.c
index 7182f49..f663bb7 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -22,8 +22,8 @@
 #include "realm/realm-hex.h"
 #include "player/player-move.h"
 #include "player/player-class.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "dungeon/dungeon.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index c94a972..0787317 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -23,7 +23,7 @@
 #include "cmd-spell.h"
 #include "player/player-status.h"
 #include "monster-spell.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "spell/spells-type.h"
 #include "cmd-basic.h"
 #include "player/player-effects.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 8b01177..070ee0e 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -20,7 +20,7 @@
 #include "realm/realm-hex.h"
 #include "player/player-move.h"
 #include "monster-spell.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "spell/spells-type.h"
 #include "melee.h"
 #include "player/player-effects.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 90cc05c..27cff7d 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -15,7 +15,7 @@
 #include "object/object-hook.h"
 #include "mutation/mutation.h"
 #include "realm/realm-hex.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "object/lite-processor.h"
 
 /*!

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 3753a94..78098e8 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -25,7 +25,7 @@
 #include "snipe.h"
 #include "files.h"
 #include "world/world.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "object/object-ego.h"
 #include "japanese.h"
 

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 3795036..d14f5e4 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -3,7 +3,7 @@
 #include "util.h"
 
 #include "object/object-hook.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "artifact.h"
 #include "player/player-class.h"
 #include "player/player-skill.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 4aa8f1d..4667a04 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -26,7 +26,7 @@
 #include "player/player-move.h"
 #include "player/player-class.h"
 #include "player-inventory.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "files.h"
 #include "gameterm.h"
 #include "cmd-smith.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 934bf46..faf1d35 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -40,8 +40,8 @@
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-ego.h"
 #include "view/display-main-window.h"
 

diff --git a/src/patron.c b/src/patron.c
index afa8449..6bd1962 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -8,7 +8,7 @@
 #include "cmd-pet.h"
 #include "object/object-curse.h"
 #include "object/object-flavor.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "mutation/mutation.h"
 #include "artifact.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 0168dc4..2e01c7c 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -44,7 +44,7 @@
 #include "player/player-personality.h"
 #include "player/player-sex.h"
 #include "player/player-damage.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "snipe.h"
 #include "files.h"
 #include "monster-spell.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index a9e7a92..8103e15 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -164,9 +164,9 @@
 #include "spells-floor.h"
 #include "feature.h"
 #include "warning.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "monster-spell.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
 #include "spell/spells-type.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index faf96b3..1664aa0 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -24,9 +24,9 @@
 #include "object/object.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"
-#include "monster.h"
-#include "monster-status.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
+#include "monster/monsterrace-hook.h"
 #include "mutation/mutation.h"
 #include "patron.h"
 #include "realm/realm-hex.h"
@@ -35,7 +35,7 @@
 #include "cmd/cmd-spell.h"
 #include "dungeon/dungeon.h"
 #include "object/object-kind.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "autopick/autopick.h"
 #include "autopick/autopick-reader-writer.h"
 #include "io/write-diary.h"

diff --git a/src/quest.c b/src/quest.c
index 7f251d4..3cb266a 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -9,8 +9,8 @@
 #include "floor/floor-events.h"
 #include "grid.h"
 #include "quest.h"
-#include "monsterrace-hook.h"
-#include "monster.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monster.h"
 #include "player/player-status.h"
 #include "player/player-personality.h"
 #include "artifact.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 92a0f2e..e7cb402 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -32,7 +32,7 @@
 #include "player-inventory.h"
 #include "realm/realm-hex.h"
 #include "grid.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "targeting.h"
 #include "realm/realm-song.h"
 #include "view/display-main-window.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 35db538..e7f9e42 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -7,9 +7,9 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "melee.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "artifact.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/room/pit-nest-kinds-table.c b/src/room/pit-nest-kinds-table.c
index 3ebfba4..0c3f182 100644 (file)
--- a/src/room/pit-nest-kinds-table.c
+++ b/src/room/pit-nest-kinds-table.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "room/pit-nest-kinds-table.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 
 /*!nest情報テーブル*/
 vault_aux_type nest_types[MAX_PIT_NEST_KINDS] =

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 65b1e77..ee27a8e 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -5,8 +5,8 @@
 #include "floor/floor-generate.h"
 #include "rooms.h"
 #include "room/rooms-pit-nest.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "sort.h"
 #include "floor/floor.h"
 #include "feature.h"

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 282e662..7eabb80 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -4,8 +4,8 @@
 #include "grid.h"
 #include "floor/floor-generate.h"
 #include "room/rooms.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "feature.h"
 #include "floor/floor.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 4da05ab..25f6651 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -7,7 +7,7 @@
 #include "room/rooms.h"
 #include "market/store.h"
 #include "trap.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "feature.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"

diff --git a/src/room/rooms.c b/src/room/rooms.c
index 195845a..0639fd4 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -56,7 +56,7 @@
 
 #include "trap.h"
 
-#include "monster.h"
+#include "monster/monster.h"
 
 
  /*!

diff --git a/src/rumor.c b/src/rumor.c
index 979063f..5c58031 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -6,7 +6,7 @@
 #include "object/object-flavor.h"
 #include "artifact.h"
 #include "dungeon/dungeon.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "floor/floor-town.h"
 #include "wild.h"
 #include "world/world.h"

diff --git a/src/save.c b/src/save.c
index 76d69f2..672f32d 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -33,7 +33,7 @@
 #include "files.h"
 #include "world/world.h"
 #include "object/object-kind.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "birth/birth.h"
 #include "market/building.h"
 #include "view/display-main-window.h"

diff --git a/src/snipe.c b/src/snipe.c
index e0fdcc0..c1ceda4 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -15,7 +15,7 @@
 #include "player/player-status.h"
 #include "cmd-basic.h"
 #include "snipe.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "view/display-main-window.h"
 
 #define MAX_SNIPE_POWERS 16

diff --git a/src/sort.c b/src/sort.c
index 1176078..86bca5e 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -3,7 +3,7 @@
 #include "floor/floor.h"
 #include "quest.h"
 #include "artifact.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 
 /*
  * Angband sorting algorithm -- quick sort in place

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index 5258032..04b3349 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -18,7 +18,7 @@
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-dump.h"
 #include "player/player-class.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "spell/spells1.h"
 #include "gameterm.h"
 #include "view/display-main-window.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 110b403..ba76872 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -26,7 +26,7 @@
 #include "effect/effect-characteristics.h"
 #include "grid.h"
 #include "trap.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "melee.h"
 #include "world/world.h"
 #include "spell/spells2.h"
@@ -43,7 +43,7 @@
 #include "autopick/autopick.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
@@ -57,7 +57,7 @@
 #include "feature.h"
 #include "view/display-main-window.h"
 #include "object/object-kind.h"
-#include "monsterrace.h"
+#include "monster/monsterrace.h"
 #include "targeting.h"
 #include "realm/realm-song.h"
 #include "english.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 6370c7e..dff65b2 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -43,8 +43,8 @@
 #include "spell/technic-info-table.h"
 #include "grid.h"
 #include "market/building-util.h"
-#include "monster-process.h"
-#include "monster-status.h"
+#include "monster/monster-process.h"
+#include "monster/monster-status.h"
 #include "monster-spell.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-save.h"

diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c
index c3de44f..c35a341 100644 (file)
--- a/src/spells-diceroll.c
+++ b/src/spells-diceroll.c
@@ -2,8 +2,8 @@
 
 #include "spells-diceroll.h"
 
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "player/player-class.h"
 #include "mutation/mutation.h"
 #include "room/rooms.h"

diff --git a/src/spells-floor.c b/src/spells-floor.c
index ef08c9a..a406c03 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -22,7 +22,7 @@
 #include "feature.h"
 #include "view/display-main-window.h"
 
-#include "monster-status.h"
+#include "monster/monster-status.h"
 
 #include "spell/spells3.h"
 #include "spells-floor.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index 28352a2..1a7ed61 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -10,7 +10,7 @@
 #include "player/player-class.h"
 #include "spells-status.h"
 #include "spell/spells-type.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "cmd-spell.h"
 #include "player/player-effects.h"
 #include "object/object-kind.h"

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 62e43b1..3cdff10 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -3,7 +3,7 @@
 
 #include "spells-summon.h"
 #include "player-inventory.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "floor/floor.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells2.h"

diff --git a/src/targeting.c b/src/targeting.c
index 8a159c0..164f434 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -22,8 +22,8 @@
 #include "dungeon/dungeon-file.h"
 #include "object/object-curse.h"
 #include "object/object-flavor.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "sort.h"
 #include "spells-summon.h"
@@ -34,7 +34,7 @@
 #include "player-inventory.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "view/display-main-window.h"
 #include "feature.h"
 #include "quest.h"

diff --git a/src/util.c b/src/util.c
index 9ecd96d..ca97f7d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -18,7 +18,7 @@
 #include "gameterm.h"
 #include "util.h"
 #include "files.h"
-#include "monsterrace-hook.h"
+#include "monster/monsterrace-hook.h"
 #include "view/display-main-window.h"
 #include "quest.h"
 #include "floor/floor.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index bc19f2e..d4afba2 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -32,7 +32,7 @@
 #include "player/mimic-info-table.h"
 #include "player/player-effects.h"
 #include "player-inventory.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "view/display-main-window.h"
 
 #include "realm/realm-hex.h"

diff --git a/src/warning.c b/src/warning.c
index 1cf605c..203a280 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -8,7 +8,7 @@
 #include "floor/floor.h"
 #include "warning.h"
 #include "player/player-status.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "object/object-flavor.h"

diff --git a/src/wild.c b/src/wild.c
index cc116c2..a29ebde 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -18,12 +18,12 @@
 #include "floor/floor.h"
 #include "wild.h"
 #include "world/world.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "realm/realm-hex.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "grid.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "quest.h"
 #include "dungeon/dungeon-file.h"
 #include "io/tokenizer.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index f284c19..79cae6c 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -45,7 +45,7 @@
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 
 #include "floor/floor.h"
 #include "floor/floor-save.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index b1f1af0..ee444fc 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -20,7 +20,7 @@
 #include "sort.h"
 #include "market/store.h"
 #include "market/store-util.h"
-#include "monster.h"
+#include "monster/monster.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 6aaf600..69332b8 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -8,7 +8,7 @@
 #include "floor/floor-events.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-save.h"
-#include "monster-status.h"
+#include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "wild.h"
 #include "player/digestion-processor.h"