[Refactor] #39970 Moved dungeon*.c/h to dungeon/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index fbdbdfc..3975ba7 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -266,8 +266,8 @@
     <ClCompile Include="..\..\src\core.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r
     <ClCompile Include="..\..\src\creature.c" />\r
-    <ClCompile Include="..\..\src\dungeon-file.c" />\r
-    <ClCompile Include="..\..\src\dungeon.c" />\r
+    <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
+    <ClCompile Include="..\..\src\dungeon\dungeon.c" />\r
     <ClCompile Include="..\..\src\english.c" />\r
     <ClCompile Include="..\..\src\feature.c" />\r
     <ClCompile Include="..\..\src\floor-events.c" />\r
@@ -625,8 +625,8 @@
     <ClInclude Include="..\..\src\angband.h" />\r
     <ClInclude Include="..\..\src\core.h" />\r
     <ClInclude Include="..\..\src\creature.h" />\r
-    <ClInclude Include="..\..\src\dungeon-file.h" />\r
-    <ClInclude Include="..\..\src\dungeon.h" />\r
+    <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
+    <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
     <ClInclude Include="..\..\src\feature.h" />\r
     <ClInclude Include="..\..\src\files.h" />\r
     <ClInclude Include="..\..\src\floor-events.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index b15f62b..ab74d7f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -114,9 +114,6 @@
     <ClCompile Include="..\..\src\object-boost.c">
       <Filter>object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\dungeon-file.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\files.c">
       <Filter>io</Filter>
@@ -163,9 +160,6 @@
     <ClCompile Include="..\..\src\floor.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\dungeon.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\player-class.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -826,6 +820,12 @@
     <ClCompile Include="..\..\src\dungeon\dungeon-processor.c">
       <Filter>dungeon</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dungeon\dungeon.c">
+      <Filter>dungeon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\dungeon\dungeon-file.c">
+      <Filter>dungeon</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -941,9 +941,6 @@
     <ClInclude Include="..\..\src\monster-process.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\dungeon-file.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\files.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -974,9 +971,6 @@
     <ClInclude Include="..\..\src\player-skill.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\dungeon.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\player-class.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -1685,6 +1679,12 @@
     <ClInclude Include="..\..\src\dungeon\dungeon-processor.h">
       <Filter>dungeon</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\dungeon\dungeon.h">
+      <Filter>dungeon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\dungeon\dungeon-file.h">
+      <Filter>dungeon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index fe6f53f..8a5043e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,13 +96,15 @@ hengband_SOURCES = \
        core/magic-effects-timeout-reducer.c core/magic-effects-timeout-reducer.h \
        core/player-processor.c core/player-processor.h \
        \
-       dungeon.c dungeon.h \
+       dungeon/dungeon.c dungeon/dungeon.h \
+       dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
+       dungeon/dungeon-file.c dungeon/dungeon-file.h \
+       \
        floor.c floor.h floor-events.c floor-events.h \
        floor-generate.c floor-generate.h \
        floor-save.h floor-save.c floor-town.h floor-town.c \
        floor-streams.c floor-streams.h \
        floor/pattern-walk.c floor/pattern-walk.h \
-       dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
        \
        feature.c feature.h \
        geometry.c geometry.h \
@@ -113,7 +115,6 @@ hengband_SOURCES = \
        h-system.h h-type.h inet.c inet.h init.c init.h \
        japanese.c japanese.h english.c english.h \
        load.c load.h \
-       dungeon-file.c dungeon-file.h \
        main.c main-x11.c main-gcu.c \
        mind.c mind.h \
        \

diff --git a/src/birth/birth.c b/src/birth/birth.c
index 3ed80ef..99fb15b 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -29,8 +29,8 @@
 #include "cmd-pet.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-help.h"
-#include "dungeon-file.h"
-#include "dungeon.h"
+#include "dungeon/dungeon-file.h"
+#include "dungeon/dungeon.h"
 #include "floor-town.h"
 #include "floor.h"
 #include "history.h"

diff --git a/src/character-dump.c b/src/character-dump.c
index 8dda0a9..4606ee8 100644 (file)
--- a/src/character-dump.c
+++ b/src/character-dump.c
@@ -2,7 +2,7 @@
 #include "core/angband-version.h"
 #include "world/world.h"
 #include "floor-town.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "market/store.h"
 #include "cmd/cmd-pet.h"
 #include "monster-status.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8154def..575bdbf 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -22,7 +22,7 @@
 #include "cmd/cmd-save.h"
 #include "chest.h"
 #include "trap.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "melee.h"
 #include "object-hook.h"
 #include "monster-status.h"
@@ -45,7 +45,7 @@
 #include "snipe.h"
 
 #include "cmd-basic.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "files.h"
 
 #include "view/display-main-window.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 3a7b318..99aebc9 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -29,9 +29,9 @@
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "grid.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
 #include "files.h"

diff --git a/src/core.c b/src/core.c
index 2da87e0..723b71c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -46,7 +46,7 @@
 #include "player-skill.h"
 
 #include "view/display-main-window.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "io/read-pref-file.h"
 #include "scores.h"
 #include "autopick/autopick-pref-processor.h"

diff --git a/src/dungeon-file.c b/src/dungeon/dungeon-file.c
similarity index 99%
rename from src/dungeon-file.c
rename to src/dungeon/dungeon-file.c
index 345dbbc..2cd28b8 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -37,7 +37,7 @@
 
 #include "io/tokenizer.h"
 #include "files.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "rooms-vault.h"
 #include "feature.h"
 #include "grid.h"
@@ -46,7 +46,7 @@
 #include "files.h"
 #include "player-skill.h"
 #include "player-race.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "market/building.h"
 #include "world/world.h"

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

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index 46bddd2..c616833 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -4,7 +4,7 @@
 #include "targeting.h"
 #include "core/player-processor.h"
 #include "quest.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "io/write-diary.h"
 #include "realm/realm-song.h"
 #include "core/hp-mp-regenerator.h"

diff --git a/src/dungeon.c b/src/dungeon/dungeon.c
similarity index 98%
rename from src/dungeon.c
rename to src/dungeon/dungeon.c
index c7a65ad..88b40cc 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon/dungeon.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 
 /*

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

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 454cb92..9f0b9d9 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "effect/effect-feature.h"
 #include "rooms.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "main/sound-definitions-table.h"
 #include "trap.h"
 #include "player-effects.h"

diff --git a/src/floor-events.c b/src/floor-events.c
index a73a69b..a245610 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "grid.h"

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 1869d76..c15105d 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -106,7 +106,7 @@
 #include "grid.h"
 #include "market/arena-info-table.h"
 #include "rooms.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-save.h"
 #include "floor-streams.h"
@@ -120,7 +120,7 @@
 #include "player-status.h"
 #include "wild.h"
 #include "monster-status.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "init.h"
 #include "feature.h"
 #include "spell/spells1.h"

diff --git a/src/floor-save.c b/src/floor-save.c
index 45dd4bb..d62c7e1 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -17,7 +17,7 @@
 #include "util.h"
 
 #include "artifact.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-save.h"
 #include "floor-events.h"

diff --git a/src/floor-streams.c b/src/floor-streams.c
index e36f988..d3c5c52 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -20,7 +20,7 @@
 
 #include "artifact.h"
 #include "floor-generate.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-streams.h"
 #include "grid.h"

diff --git a/src/floor.c b/src/floor.c
index 274b968..53262ba 100644 (file)
--- a/src/floor.c
+++ b/src/floor.c
@@ -3,7 +3,7 @@
 #include "floor-save.h"
 #include "floor-generate.h"
 #include "grid.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "rooms.h"
 #include "quest.h"
 #include "object-hook.h"

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index eeff931..970ec5c 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "floor/pattern-walk.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "io/write-diary.h"
 #include "player-move.h"
 #include "player-effects.h"

diff --git a/src/grid.c b/src/grid.c
index 618386d..8a32f69 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -22,7 +22,7 @@
 #include "world/world.h"
 #include "object-flavor.h"
 #include "object-hook.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor-generate.h"
 #include "grid.h"
 #include "trap.h"

diff --git a/src/init.c b/src/init.c
index ed71e38..a42fa05 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -47,12 +47,12 @@
 #include "rooms.h"
 #include "market/store.h"
 #include "wild.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "files.h"
 #include "feature.h"
 #include "floor.h"
 #include "floor-town.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "rooms-vault.h"
 #include "player-skill.h"
 #include "player-class.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index f31eea2..79649d7 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -9,7 +9,7 @@
 #include "io/input-key-processor.h"
 #include "world/world.h"
 #include "core/special-internal-keys.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "snipe.h"
 #include "autopick/autopick-pref-processor.h"
 #include "market/store-util.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index d9c5e96..18273ef 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -8,8 +8,8 @@
 #include "core.h"
 #include "quest.h"
 #include "files.h"
-#include "dungeon.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon.h"
+#include "dungeon/dungeon-file.h"
 #include "world/world.h"
 #include "market/arena-info-table.h"
 

diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c
index 60f84f3..9e3c0b5 100644 (file)
--- a/src/knowledge/knowledge-features.c
+++ b/src/knowledge/knowledge-features.c
@@ -11,7 +11,7 @@
 #include "gameterm.h"
 #include "world/world.h"
 #include "cmd/lighting-level-table.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 
  /*

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 98dc854..4993894 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -11,8 +11,8 @@
 #include "core.h" // 暫定、init_flagsのため。後で消すかも.
 #include "artifact.h"
 #include "object-flavor.h"
-#include "dungeon.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon.h"
+#include "dungeon/dungeon-file.h"
 #include "sort.h"
 #include "world/world.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index 8e64900..ff47874 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -10,7 +10,7 @@
 #include "avatar.h"
 #include "birth/birth.h"
 #include "core/show-file.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "world/world.h"
 #include "market/store-util.h"
 #include "floor-town.h"

diff --git a/src/load.c b/src/load.c
index ee2ccfb..cbaa3a7 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -49,7 +49,7 @@
 #include "market/building.h"
 #include "report.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "feature.h"
 #include "floor-generate.h"
 #include "trap.h"
@@ -71,7 +71,7 @@
 #include "grid.h"
 
 #include "cmd-pet.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "io/uid-checker.h"
 #include "files.h"
 #include "player-skill.h"

diff --git a/src/main-win.c b/src/main-win.c
index fbf7bd5..43774ec 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -123,7 +123,7 @@
 #include <locale.h>
 #include "z-term.h"
 #include "save.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 /*
  * Available graphic modes

diff --git a/src/market/building.c b/src/market/building.c
index 48f9d3e..3503d33 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -40,7 +40,7 @@
 
 #include "avatar.h"
 #include "market/building.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "mutation/mutation.h"
 #include "quest.h"
 #include "artifact.h"
@@ -49,7 +49,7 @@
 #include "spells-object.h"
 #include "spells-status.h"
 #include "realm/realm-hex.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 
 #include "files.h"
 #include "player-status.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index 9ad2c0d..2701b96 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -8,7 +8,7 @@
 #include "autopick/autopick-pref-processor.h"
 #include "cmd/cmd-draw.h"
 #include "cmd/cmd-dump.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "grid.h"
 #include "monster.h"

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

diff --git a/src/monster1.c b/src/monster1.c
index c040d64..bba915c 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -31,7 +31,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "wild.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "melee.h"
 #include "japanese.h"

diff --git a/src/monster2.c b/src/monster2.c
index a405255..2165439 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -18,7 +18,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd-pet.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "object-flavor.h"
 #include "monsterrace-hook.h"

diff --git a/src/monsterrace-hook.c b/src/monsterrace-hook.c
index 65190fb..a05d148 100644 (file)
--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -5,7 +5,7 @@
 #include "monster.h"
 #include "monster-spell.h"
 #include "floor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "monsterrace.h"
 #include "melee.h"
 

diff --git a/src/mspells1.c b/src/mspells1.c
index 76ae440..8a51e29 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -42,7 +42,7 @@
 #include "util.h"
 
 #include "effect/effect-characteristics.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "grid.h"
 #include "object-curse.h"
 #include "quest.h"

diff --git a/src/mspells2.c b/src/mspells2.c
index 4f5c785..4b46734 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -26,7 +26,7 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "view/display-main-window.h"
 #include "spell/spells3.h"

diff --git a/src/object2.c b/src/object2.c
index 9b0c6a6..edfa029 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -23,7 +23,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-spell.h"
 #include "spell/spells3.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "grid.h"
 #include "object/object-kind.h"

diff --git a/src/player-move.c b/src/player-move.c
index 6fa2930..6dcfcc7 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -147,7 +147,7 @@
 
 #include "realm/realm-song.h"
 #include "autopick/autopick.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "melee.h"
 #include "grid.h"

diff --git a/src/player-status.c b/src/player-status.c
index b9d7eb7..7c0d6a9 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -33,7 +33,7 @@
 #include "realm/realm-song.h"
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-spell.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "object/object-kind.h"
 #include "monsterrace.h"
 #include "autopick/autopick.h"

diff --git a/src/quest.c b/src/quest.c
index 752d71f..fda4eda 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -3,7 +3,7 @@
 #include "main/music-definitions-table.h"
 
 #include "core.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-save.h"
 #include "floor-events.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index c5e2e0b..0cc3158 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -4,7 +4,7 @@
 
 #include "cmd-spell.h"
 #include "cmd-basic.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "melee.h"
 #include "monsterrace-hook.h"

diff --git a/src/report.c b/src/report.c
index 9f5b67d..516a6aa 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -10,7 +10,7 @@
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"
 #include "inet.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 #include "player-personality.h"
 #include "character-dump.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index e3e59cf..1962fa7 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -10,7 +10,7 @@
 #include "sort.h"
 #include "floor.h"
 #include "feature.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "room/pit-nest-kinds-table.h"
 
 /*!

diff --git a/src/rooms-fractal.c b/src/rooms-fractal.c
index f7de151..b05e919 100644 (file)
--- a/src/rooms-fractal.c
+++ b/src/rooms-fractal.c
@@ -4,7 +4,7 @@
 #include "rooms.h"
 #include "rooms-normal.h"
 #include "floor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 /*!
 * @brief タイプ9の部屋…フラクタルカーブによる洞窟生成 / Type 9 -- Driver routine to create fractal grid

diff --git a/src/rooms-normal.c b/src/rooms-normal.c
index a942efe..7d43acb 100644 (file)
--- a/src/rooms-normal.c
+++ b/src/rooms-normal.c
@@ -3,7 +3,7 @@
 #include "trap.h"
 
 #include "floor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "rooms.h"
 
 

diff --git a/src/rooms-special.c b/src/rooms-special.c
index 4032606..3293de5 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -9,7 +9,7 @@
 #include "object/object-kind-hook.h"
 #include "feature.h"
 #include "floor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 
 /*!

diff --git a/src/rooms-trap.c b/src/rooms-trap.c
index dc712fe..f2969fb 100644 (file)
--- a/src/rooms-trap.c
+++ b/src/rooms-trap.c
@@ -6,7 +6,7 @@
 #include "rooms.h"
 #include "floor.h"
 #include "feature.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 /*!
 * @brief タイプ14の部屋…特殊トラップ部屋の生成 / Type 14 -- trapped rooms

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 72b5185..7bebaba 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -10,7 +10,7 @@
 #include "monster.h"
 #include "feature.h"
 #include "floor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "geometry.h"
 #include "wild.h"
 #include "market/store-util.h"

diff --git a/src/rooms.c b/src/rooms.c
index 7e8c76f..24eda61 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -42,7 +42,7 @@
 #include "feature.h"
 #include "floor.h"
 #include "floor-generate.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "grid.h"
 #include "rooms.h"
 

diff --git a/src/rumor.c b/src/rumor.c
index 8e9698d..7416cc7 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -5,7 +5,7 @@
 #include "files.h"
 #include "object-flavor.h"
 #include "artifact.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "monsterrace.h"
 #include "floor-town.h"
 #include "wild.h"

diff --git a/src/save.c b/src/save.c
index bca1d6f..01355e2 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -20,7 +20,7 @@
 #include "core/angband-version.h"
 #include "artifact.h"
 #include "sort.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "quest.h"
 #include "market/store.h"
 #include "market/store-util.h"

diff --git a/src/scores.c b/src/scores.c
index 7705e53..6ab3aae 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -17,7 +17,7 @@
 #include "core/turn-compensator.h"
 #include "core/angband-version.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "player/race-info-table.h"
 #include "player-status.h"
 #include "player-class.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 1f90c87..8a44015 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -52,7 +52,7 @@
 #include "player-damage.h"
 #include "player-inventory.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor-events.h"
 #include "feature.h"
 #include "view/display-main-window.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 0ba291d..e8dee49 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -21,7 +21,7 @@
 
 #include "creature.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor-town.h"
 #include "object-boost.h"

diff --git a/src/spells-floor.c b/src/spells-floor.c
index d7a342f..37f550d 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "grid.h"
 #include "quest.h"

diff --git a/src/targeting.c b/src/targeting.c
index f1f102f..931d05b 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -19,7 +19,7 @@
 
 #include "market/building.h"
 #include "cmd-pet.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "object-curse.h"
 #include "object-flavor.h"
 #include "monster.h"
@@ -38,7 +38,7 @@
 #include "view/display-main-window.h"
 #include "feature.h"
 #include "quest.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
 

diff --git a/src/trap.c b/src/trap.c
index 94c6d57..9e4b749 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -22,7 +22,7 @@
 #include "floor-save.h"
 #include "init.h"
 #include "files.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "spell/process-effect.h"
 #include "spell/spells2.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index e9461ff..4e90a56 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -41,7 +41,7 @@
 #include "object-flavor.h"
 
 #include "grid.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor-town.h"
 #include "feature.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index f746998..c47af77 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -17,7 +17,7 @@
 #include "quest.h"
 #include "core.h" // 暫定。後で消す
 #include "knowledge/knowledge-mutations.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "object/object-kind.h"
 #include "view/display-util.h"
 #include "view/display-characteristic.h"

diff --git a/src/warning.c b/src/warning.c
index 3a20ae5..0ba44f8 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -12,7 +12,7 @@
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "object-flavor.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "player/mimic-info-table.h"
 #include "player-class.h"
 #include "melee.h"

diff --git a/src/wild.c b/src/wild.c
index 818aab6..fdebe43 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -14,7 +14,7 @@
 #include "util.h"
 #include "core.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "floor.h"
 #include "wild.h"
 #include "world/world.h"
@@ -25,7 +25,7 @@
 #include "grid.h"
 #include "monster-status.h"
 #include "quest.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "io/tokenizer.h"
 #include "files.h"
 #include "feature.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index b993b73..fd33fb0 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -17,7 +17,7 @@
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-draw.h"
 #include "cmd/cmd-dump.h"
@@ -50,7 +50,7 @@
 #include "floor.h"
 #include "floor-save.h"
 #include "grid.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "files.h"
 #include "monster-spell.h"
 #include "market/building.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 390835b..1c3ffc0 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -2,7 +2,7 @@
 #include "world/world-movement-processor.h"
 #include "main/sound-definitions-table.h"
 #include "io/write-diary.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "quest.h"
 #include "world/world.h"
 #include "cmd/cmd-save.h"

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 221ab0e..8963b5c 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "world/world-turn-processor.h"
 #include "world/world.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 #include "market/store.h"
 #include "market/store-util.h"
 #include "io/write-diary.h"