[Refactor] #2711 Moved dungeon/dungeon.cpp/h to system/dungeon-info.cpp/h

Notes: DungeonInfo class will be defined, dungeon_type will be renamed to DungeonDefinition, max_dlv will be incorporated into new class DungeonMemory and both of 2 classes will be incorporated into DungeonInfo

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 7159999..0ae4314 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -855,7 +855,7 @@
     <ClCompile Include="..\..\src\core\show-file.cpp" />\r
     <ClCompile Include="..\..\src\core\speed-table.cpp" />\r
     <ClCompile Include="..\..\src\info-reader\fixed-map-parser.cpp" />\r
-    <ClCompile Include="..\..\src\dungeon\dungeon.cpp" />\r
+    <ClCompile Include="..\..\src\system\dungeon-info.cpp" />\r
     <ClCompile Include="..\..\src\locale\english.cpp" />\r
     <ClCompile Include="..\..\src\grid\feature.cpp" />\r
     <ClCompile Include="..\..\src\floor\floor-events.cpp" />\r
@@ -1920,7 +1920,7 @@
     <ClInclude Include="..\..\src\system\system-variables.h" />\r
     <ClInclude Include="..\..\src\core\speed-table.h" />\r
     <ClInclude Include="..\..\src\info-reader\fixed-map-parser.h" />\r
-    <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
+    <ClInclude Include="..\..\src\system\dungeon-info.h" />\r
     <ClInclude Include="..\..\src\grid\feature.h" />\r
     <ClInclude Include="..\..\src\io\files-util.h" />\r
     <ClInclude Include="..\..\src\floor\floor-events.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 7fe8bbe..d1c2940 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -344,9 +344,6 @@
     <ClCompile Include="..\..\src\dungeon\dungeon-processor.cpp">\r
       <Filter>dungeon</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\dungeon\dungeon.cpp">\r
-      <Filter>dungeon</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\core\game-play.cpp">\r
       <Filter>core</Filter>\r
     </ClCompile>\r
@@ -2472,6 +2469,9 @@
     <ClCompile Include="..\..\src\system\floor-type-definition.cpp">\r
       <Filter>system</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\system\dungeon-info.cpp">\r
+      <Filter>system</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
@@ -2843,9 +2843,6 @@
     <ClInclude Include="..\..\src\dungeon\dungeon-processor.h">\r
       <Filter>dungeon</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\dungeon\dungeon.h">\r
-      <Filter>dungeon</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\core\game-play.h">\r
       <Filter>core</Filter>\r
     </ClInclude>\r
@@ -5367,6 +5364,9 @@
     <ClInclude Include="..\..\src\system\baseitem-info-definition.h">\r
       <Filter>system</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\system\dungeon-info.h">\r
+      <Filter>system</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\src\wall.bmp" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 18e875c..ec560a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,7 +164,6 @@ hengband_SOURCES = \
        core/visuals-reseter.cpp core/visuals-reseter.h \
        core/window-redrawer.cpp core/window-redrawer.h \
        \
-       dungeon/dungeon.cpp dungeon/dungeon.h \
        dungeon/dungeon-flag-mask.h \
        dungeon/dungeon-flag-types.h \
        dungeon/dungeon-processor.cpp dungeon/dungeon-processor.h \
@@ -913,6 +912,7 @@ hengband_SOURCES = \
        system/baseitem-info-definition.cpp system/baseitem-info-definition.h \
        system/building-type-definition.cpp system/building-type-definition.h \
        system/dungeon-data-definition.h \
+       system/dungeon-info.cpp system/dungeon-info.h \
        system/floor-type-definition.cpp system/floor-type-definition.h \
        system/grid-type-definition.cpp system/grid-type-definition.h \
        system/game-option-types.h \

diff --git a/src/action/action-limited.cpp b/src/action/action-limited.cpp
index e864da7..7812d19 100644 (file)
--- a/src/action/action-limited.cpp
+++ b/src/action/action-limited.cpp
@@ -5,13 +5,13 @@
 
 #include "action/action-limited.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "game-option/disturbance-options.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "player-base/player-class.h"
 #include "player/player-status.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/avatar/avatar-changer.cpp b/src/avatar/avatar-changer.cpp
index 1108edc..ca8607f 100644 (file)
--- a/src/avatar/avatar-changer.cpp
+++ b/src/avatar/avatar-changer.cpp
@@ -6,7 +6,6 @@
 
 #include "avatar/avatar-changer.h"
 #include "avatar/avatar.h"
-#include "dungeon/dungeon.h"
 #include "monster-race/monster-kind-mask.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-ability-mask.h"
@@ -15,6 +14,7 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp
index 40cfa46..a66ab4c 100644 (file)
--- a/src/birth/game-play-initializer.cpp
+++ b/src/birth/game-play-initializer.cpp
@@ -1,5 +1,4 @@
 #include "birth/game-play-initializer.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-util.h"
 #include "game-option/birth-options.h"
@@ -18,6 +17,7 @@
 #include "player/digestion-processor.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
index a563ced..1d4a771 100644 (file)
--- a/src/cmd-action/cmd-attack.cpp
+++ b/src/cmd-action/cmd-attack.cpp
@@ -14,7 +14,6 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "game-option/cheat-types.h"
@@ -45,6 +44,7 @@
 #include "player/player-status.h"
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index d94e752..4bee38e 100644 (file)
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -9,7 +9,6 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-mode-changer.h"
@@ -36,6 +35,7 @@
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"
 #include "status/action-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/cmd-io/cmd-dump.cpp b/src/cmd-io/cmd-dump.cpp
index 7b2783a..5e720e7 100644 (file)
--- a/src/cmd-io/cmd-dump.cpp
+++ b/src/cmd-io/cmd-dump.cpp
@@ -12,7 +12,6 @@
 #include "cmd-io/cmd-dump.h"
 #include "cmd-io/feeling-table.h"
 #include "core/asking-player.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"
 #include "io-dump/dump-remover.h"
@@ -28,6 +27,7 @@
 #include "player/player-status-flags.h"
 #include "player/player-status.h"
 #include "system/angband-version.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 532fec6..933ed1e 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -8,7 +8,6 @@
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-save-util.h"
 #include "floor/floor-util.h"
 #include "floor/geometry.h"
@@ -51,6 +50,7 @@
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"
 #include "status/action-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/core/scores.cpp b/src/core/scores.cpp
index 2b3e1b3..c220ff5 100644 (file)
--- a/src/core/scores.cpp
+++ b/src/core/scores.cpp
@@ -15,7 +15,6 @@
 #include "core/asking-player.h"
 #include "core/score-util.h"
 #include "core/turn-compensator.h"
-#include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "game-option/game-play-options.h"
 #include "io/files-util.h"
@@ -30,6 +29,7 @@
 #include "player/player-status.h"
 #include "player/race-info-table.h"
 #include "system/angband-version.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp
index 7d2479a..8476caa 100644 (file)
--- a/src/dungeon/dungeon-processor.cpp
+++ b/src/dungeon/dungeon-processor.cpp
@@ -9,7 +9,6 @@
 #include "core/stuff-handler.h"
 #include "core/turn-compensator.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-leaver.h"
 #include "floor/floor-save-util.h"
@@ -35,6 +34,7 @@
 #include "realm/realm-song-numbers.h"
 #include "realm/realm-song.h"
 #include "spell-realm/spells-song.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
index 3c143bf..c1f2bf8 100644 (file)
--- a/src/dungeon/quest.cpp
+++ b/src/dungeon/quest.cpp
@@ -2,7 +2,6 @@
 #include "cmd-io/cmd-dump.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/floor-events.h"
 #include "floor/floor-mode-changer.h"
@@ -29,6 +28,7 @@
 #include "player/player-personality-types.h"
 #include "player/player-status.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/effect/effect-feature.cpp b/src/effect/effect-feature.cpp
index e70716a..7e334b9 100644 (file)
--- a/src/effect/effect-feature.cpp
+++ b/src/effect/effect-feature.cpp
@@ -1,7 +1,6 @@
 #include "effect/effect-feature.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h" // 暫定、後で消す.
 #include "floor/cave.h"
@@ -17,6 +16,7 @@
 #include "player/special-defense-types.h"
 #include "room/door-definition.h"
 #include "spell-class/spells-mirror-master.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/floor/cave-generator.cpp b/src/floor/cave-generator.cpp
index e88797b..d6b5daf 100644 (file)
--- a/src/floor/cave-generator.cpp
+++ b/src/floor/cave-generator.cpp
@@ -1,6 +1,5 @@
 #include "floor/cave-generator.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest-monster-placer.h"
 #include "floor/dungeon-tunnel-util.h"
 #include "floor/floor-allocation-types.h"
@@ -24,6 +23,7 @@
 #include "room/room-generator.h"
 #include "room/rooms-maze-vault.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp
index 0eb96dd..75bde47 100644 (file)
--- a/src/floor/floor-changer.cpp
+++ b/src/floor/floor-changer.cpp
@@ -1,6 +1,5 @@
 #include "floor/floor-changer.h"
 #include "action/travel-execution.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest-monster-placer.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
@@ -36,6 +35,7 @@
 #include "player-base/player-class.h"
 #include "spell-kind/spells-floor.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index cd0aca2..2f75eb0 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -5,7 +5,6 @@
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/geometry.h"
@@ -34,6 +33,7 @@
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-ring-types.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index 9f59bee..018662d 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -11,7 +11,6 @@
 
 #include "floor/floor-generator.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave-generator.h"
 #include "floor/floor-events.h"
@@ -40,6 +39,7 @@
 #include "monster/monster-util.h"
 #include "player/player-status.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp
index 69f6547..d874cc0 100644 (file)
--- a/src/floor/floor-leaver.cpp
+++ b/src/floor/floor-leaver.cpp
@@ -1,6 +1,5 @@
 #include "floor/floor-leaver.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-events.h"
@@ -33,6 +32,7 @@
 #include "save/floor-writer.h"
 #include "spell-class/spells-mirror-master.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp
index 84db4dc..7eb6110 100644 (file)
--- a/src/floor/floor-streams.cpp
+++ b/src/floor/floor-streams.cpp
@@ -14,7 +14,6 @@
 
 #include "floor/floor-streams.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/cave.h"
@@ -33,6 +32,7 @@
 #include "spell-kind/spells-floor.h"
 #include "system/artifact-type-definition.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index fd33e1a..539d3e2 100644 (file)
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -4,7 +4,6 @@
  * @author deskull
  */
 #include "floor/floor-util.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "floor/cave.h"
@@ -16,6 +15,7 @@
 #include "grid/feature.h"
 #include "perception/object-perception.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/floor/object-allocator.cpp b/src/floor/object-allocator.cpp
index dab10e3..607cd19 100644 (file)
--- a/src/floor/object-allocator.cpp
+++ b/src/floor/object-allocator.cpp
@@ -1,5 +1,4 @@
 #include "floor/object-allocator.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/dungeon-tunnel-util.h"
@@ -13,6 +12,7 @@
 #include "grid/trap.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/floor/pattern-walk.cpp b/src/floor/pattern-walk.cpp
index 2f2ce27..db9e219 100644 (file)
--- a/src/floor/pattern-walk.cpp
+++ b/src/floor/pattern-walk.cpp
@@ -1,7 +1,6 @@
 #include "floor/pattern-walk.h"
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-mode-changer.h"
@@ -20,6 +19,7 @@
 #include "spell/spells-status.h"
 #include "status/bad-status-setter.h"
 #include "status/experience.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index 61596f3..a64ed64 100644 (file)
--- a/src/floor/wild.cpp
+++ b/src/floor/wild.cpp
@@ -12,7 +12,6 @@
 #include "floor/wild.h"
 #include "core/asking-player.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-town.h"
@@ -38,6 +37,7 @@
 #include "realm/realm-names-table.h"
 #include "spell-realm/spells-hex.h"
 #include "status/action-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/grid/door.cpp b/src/grid/door.cpp
index ee0e57f..d56f742 100644 (file)
--- a/src/grid/door.cpp
+++ b/src/grid/door.cpp
@@ -1,10 +1,10 @@
 #include "grid/door.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "room/door-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/grid/feature-generator.cpp b/src/grid/feature-generator.cpp
index 1df7752..f4f1116 100644 (file)
--- a/src/grid/feature-generator.cpp
+++ b/src/grid/feature-generator.cpp
@@ -1,7 +1,6 @@
 #include "grid/feature-generator.h"
 #include "dungeon/dungeon-flag-mask.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/dungeon-tunnel-util.h"
@@ -13,6 +12,7 @@
 #include "room/lake-types.h"
 #include "room/rooms-builder.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/grid/feature.cpp b/src/grid/feature.cpp
index 093e73d..c1b5eda 100644 (file)
--- a/src/grid/feature.cpp
+++ b/src/grid/feature.cpp
@@ -1,7 +1,6 @@
 #include "grid/feature.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/geometry.h"
 #include "game-option/map-screen-options.h"
@@ -11,6 +10,7 @@
 #include "monster/monster-update.h"
 #include "player/special-defense-types.h"
 #include "room/door-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h" // @todo 相互依存している. 後で何とかする.
 #include "system/player-type-definition.h"

diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index b7f30c3..88d7bc4 100644 (file)
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -17,7 +17,6 @@
 #include "grid/grid.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
@@ -46,6 +45,7 @@
 #include "player/player-status-flags.h"
 #include "player/player-status.h"
 #include "room/rooms-builder.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/grid/stair.cpp b/src/grid/stair.cpp
index 78884d3..bd61f3c 100644 (file)
--- a/src/grid/stair.cpp
+++ b/src/grid/stair.cpp
@@ -1,10 +1,10 @@
 #include "grid/stair.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "game-option/birth-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp
index 360af8b..88da4c4 100644 (file)
--- a/src/grid/trap.cpp
+++ b/src/grid/trap.cpp
@@ -2,7 +2,6 @@
 #include "cmd-io/cmd-dump.h"
 #include "cmd-io/cmd-save.h"
 #include "core/disturbance.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
@@ -35,6 +34,7 @@
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
 #include "status/element-resistance.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index 5961d10..9555b9d 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -3,7 +3,6 @@
 #include "cmd-action/cmd-pet.h"
 #include "core/player-redraw-types.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/pattern-walk.h"
@@ -37,6 +36,7 @@
 #include "player/special-defense-types.h"
 #include "status/bad-status-setter.h"
 #include "status/element-resistance.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/info-reader/dungeon-reader.cpp b/src/info-reader/dungeon-reader.cpp
index e69fdb9..007b892 100644 (file)
--- a/src/info-reader/dungeon-reader.cpp
+++ b/src/info-reader/dungeon-reader.cpp
@@ -1,5 +1,4 @@
 #include "info-reader/dungeon-reader.h"
-#include "dungeon/dungeon.h"
 #include "grid/feature.h"
 #include "info-reader/dungeon-info-tokens-table.h"
 #include "info-reader/feature-reader.h"
@@ -8,6 +7,7 @@
 #include "info-reader/race-info-tokens-table.h"
 #include "io/tokenizer.h"
 #include "main/angband-headers.h"
+#include "system/dungeon-info.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index cdfe533..836df09 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -3,7 +3,6 @@
 #include "artifact/fixed-art-types.h"
 #include "avatar/avatar.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "floor/floor-town.h"
@@ -36,6 +35,7 @@
 #include "store/store.h"
 #include "system/angband-version.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp
index 4a35af3..9728ad8 100644 (file)
--- a/src/io/input-key-processor.cpp
+++ b/src/io/input-key-processor.cpp
@@ -50,7 +50,6 @@
 #include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h" //!< @do_cmd_quest() がある。後で移設する.
 #include "effect/spells-effect-util.h"
 #include "floor/wild.h"
@@ -87,6 +86,7 @@
 #include "store/cmd-store.h"
 #include "store/home.h"
 #include "store/store-util.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/io/report.cpp b/src/io/report.cpp
index f1ea24b..b9eadc7 100644 (file)
--- a/src/io/report.cpp
+++ b/src/io/report.cpp
@@ -11,7 +11,6 @@
 #include "core/stuff-handler.h"
 #include "core/turn-compensator.h"
 #include "core/visuals-reseter.h"
-#include "dungeon/dungeon.h"
 #include "game-option/special-options.h"
 #include "io-dump/character-dump.h"
 #include "io/inet.h"
@@ -24,6 +23,7 @@
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"
 #include "system/angband-version.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "system/system-variables.h"

diff --git a/src/io/screen-util.cpp b/src/io/screen-util.cpp
index 4c72f51..beab48f 100644 (file)
--- a/src/io/screen-util.cpp
+++ b/src/io/screen-util.cpp
@@ -14,7 +14,6 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
@@ -27,6 +26,7 @@
 #include "io/input-key-acceptor.h"
 #include "monster/monster-update.h"
 #include "player-info/mimic-info-table.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"

diff --git a/src/io/write-diary.cpp b/src/io/write-diary.cpp
index e8d02d0..aed3756 100644 (file)
--- a/src/io/write-diary.cpp
+++ b/src/io/write-diary.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "io/write-diary.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "info-reader/fixed-map-parser.h"
 #include "io/files-util.h"
 #include "market/arena-info-table.h"
 #include "monster-race/monster-race.h"
 #include "player/player-status.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/knowledge/knowledge-features.cpp b/src/knowledge/knowledge-features.cpp
index ca8f1c3..fa031ca 100644 (file)
--- a/src/knowledge/knowledge-features.cpp
+++ b/src/knowledge/knowledge-features.cpp
@@ -6,12 +6,12 @@
 
 #include "knowledge/knowledge-features.h"
 #include "core/show-file.h"
-#include "dungeon/dungeon.h"
 #include "game-option/special-options.h"
 #include "io-dump/dump-util.h"
 #include "io/input-key-acceptor.h"
 #include "knowledge/lighting-level-table.h"
 #include "monster-race/monster-race.h"
+#include "system/dungeon-info.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/knowledge/knowledge-quests.cpp b/src/knowledge/knowledge-quests.cpp
index e6c8d55..24fa094 100644 (file)
--- a/src/knowledge/knowledge-quests.cpp
+++ b/src/knowledge/knowledge-quests.cpp
@@ -7,7 +7,6 @@
 #include "knowledge/knowledge-quests.h"
 #include "artifact/fixed-art-types.h"
 #include "core/show-file.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
@@ -18,6 +17,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object/object-kind-hook.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/load/load-zangband.cpp b/src/load/load-zangband.cpp
index 874cb2e..d02e83d 100644 (file)
--- a/src/load/load-zangband.cpp
+++ b/src/load/load-zangband.cpp
@@ -1,7 +1,6 @@
 #include "load/load-zangband.h"
 #include "avatar/avatar.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "game-option/option-flags.h"
 #include "info-reader/fixed-map-parser.h"
@@ -19,6 +18,7 @@
 #include "player/player-skill.h"
 #include "realm/realm-types.h"
 #include "spell/spells-status.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 6b26cb7..ebc5356 100644 (file)
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -7,7 +7,6 @@
 
 #include "load/old/load-v1-5-0.h"
 #include "artifact/fixed-art-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"
 #include "grid/feature.h"
@@ -41,6 +40,7 @@
 #include "sv-definition/sv-lite-types.h"
 #include "system/angband-exceptions.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/load/old/load-v1-7-0.cpp b/src/load/old/load-v1-7-0.cpp
index 3d0b755..d815c22 100644 (file)
--- a/src/load/old/load-v1-7-0.cpp
+++ b/src/load/old/load-v1-7-0.cpp
@@ -1,8 +1,8 @@
 #include "load/old/load-v1-7-0.h"
-#include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 

diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp
index 40e411b..7f1940d 100644 (file)
--- a/src/load/player-info-loader.cpp
+++ b/src/load/player-info-loader.cpp
@@ -1,6 +1,5 @@
 #include "load/player-info-loader.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "load/angband-version-comparer.h"
 #include "load/birth-loader.h"
 #include "load/dummy-loader.h"
@@ -21,6 +20,7 @@
 #include "player/player-skill.h"
 #include "spell-realm/spells-song.h"
 #include "system/angband-exceptions.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-acceleration.h"

diff --git a/src/load/world-loader.cpp b/src/load/world-loader.cpp
index ec2e584..b8507c4 100644 (file)
--- a/src/load/world-loader.cpp
+++ b/src/load/world-loader.cpp
@@ -1,12 +1,12 @@
 #include "load/world-loader.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "floor/wild.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/load-zangband.h"
 #include "market/bounty.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "world/world.h"

diff --git a/src/main-win/main-win-music.cpp b/src/main-win/main-win-music.cpp
index 2426e6d..5be470b 100644 (file)
--- a/src/main-win/main-win-music.cpp
+++ b/src/main-win/main-win-music.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "main-win/main-win-music.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"
 #include "main-win/main-win-define.h"
@@ -16,6 +15,7 @@
 #include "main/scene-table.h"
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race.h"
+#include "system/dungeon-info.h"
 #include "system/monster-race-definition.h"
 #include "term/z-term.h"
 #include "util/angband-files.h"

diff --git a/src/main/angband-initializer.cpp b/src/main/angband-initializer.cpp
index 50bd99d..d679f9b 100644 (file)
--- a/src/main/angband-initializer.cpp
+++ b/src/main/angband-initializer.cpp
@@ -13,7 +13,6 @@
  */
 
 #include "main/angband-initializer.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/wild.h"
 #include "info-reader/feature-reader.h"
@@ -26,6 +25,7 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags7.h"
 #include "system/angband-version.h"
+#include "system/dungeon-info.h"
 #include "system/monster-race-definition.h"
 #include "system/system-variables.h"
 #include "term/screen-processor.h"

diff --git a/src/main/game-data-initializer.cpp b/src/main/game-data-initializer.cpp
index dae1b38..6999a30 100644 (file)
--- a/src/main/game-data-initializer.cpp
+++ b/src/main/game-data-initializer.cpp
@@ -5,7 +5,6 @@
 
 #include "main/game-data-initializer.h"
 #include "cmd-io/macro-util.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-util.h"
 #include "game-option/option-flags.h"
@@ -13,6 +12,7 @@
 #include "monster-race/monster-race.h"
 #include "system/alloc-entries.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/main/info-initializer.cpp b/src/main/info-initializer.cpp
index bf5c924..24df8f1 100644 (file)
--- a/src/main/info-initializer.cpp
+++ b/src/main/info-initializer.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "main/info-initializer.h"
-#include "dungeon/dungeon.h"
 #include "grid/feature.h"
 #include "info-reader/artifact-reader.h"
 #include "info-reader/baseitem-reader.h"
@@ -30,6 +29,7 @@
 #include "system/angband-version.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"

diff --git a/src/main/scene-table-floor.cpp b/src/main/scene-table-floor.cpp
index f623c23..7a690b2 100644 (file)
--- a/src/main/scene-table-floor.cpp
+++ b/src/main/scene-table-floor.cpp
@@ -4,9 +4,9 @@
  */
 
 #include "main/scene-table-floor.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "main/music-definitions-table.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 

diff --git a/src/market/arena.cpp b/src/market/arena.cpp
index 7752d5f..399c78b 100644 (file)
--- a/src/market/arena.cpp
+++ b/src/market/arena.cpp
@@ -4,7 +4,6 @@
 #include "core/show-file.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-mode-changer.h"
 #include "io/input-key-acceptor.h"
 #include "main/sound-of-music.h"
@@ -21,6 +20,7 @@
 #include "player-base/player-class.h"
 #include "status/buff-setter.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index 3ba3ee8..6f9f293 100644 (file)
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -5,7 +5,6 @@
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "game-option/cheat-options.h"
 #include "inventory/inventory-object.h"
@@ -27,6 +26,7 @@
 #include "object/object-kind-hook.h"
 #include "perception/object-perception.h"
 #include "sv-definition/sv-other-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/melee/melee-spell-flags-checker.cpp b/src/melee/melee-spell-flags-checker.cpp
index 4d4b82f..18ce2e7 100644 (file)
--- a/src/melee/melee-spell-flags-checker.cpp
+++ b/src/melee/melee-spell-flags-checker.cpp
@@ -1,6 +1,5 @@
 #include "melee/melee-spell-flags-checker.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/geometry.h"
 #include "floor/line-of-sight.h"
@@ -20,6 +19,7 @@
 #include "pet/pet-util.h"
 #include "player-base/player-class.h"
 #include "spell-kind/spells-world.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/melee/melee-spell-util.cpp b/src/melee/melee-spell-util.cpp
index c9026e8..ce7e8a2 100644 (file)
--- a/src/melee/melee-spell-util.cpp
+++ b/src/melee/melee-spell-util.cpp
@@ -1,11 +1,11 @@
 #include "melee/melee-spell-util.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/geometry.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/melee/monster-attack-monster.cpp b/src/melee/monster-attack-monster.cpp
index 0af738f..bff37a2 100644 (file)
--- a/src/melee/monster-attack-monster.cpp
+++ b/src/melee/monster-attack-monster.cpp
@@ -10,7 +10,6 @@
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
@@ -32,6 +31,7 @@
 #include "monster/monster-status.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell-realm/spells-hex.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/monster-attack/monster-attack-player.cpp b/src/monster-attack/monster-attack-player.cpp
index f6f37f2..5ffde7d 100644 (file)
--- a/src/monster-attack/monster-attack-player.cpp
+++ b/src/monster-attack/monster-attack-player.cpp
@@ -15,7 +15,6 @@
 #include "core/disturbance.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "inventory/inventory-slot-types.h"
 #include "main/sound-definitions-table.h"
@@ -48,6 +47,7 @@
 #include "status/action-setter.h"
 #include "status/bad-status-setter.h"
 #include "system/angband.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/monster-attack/monster-attack-processor.cpp b/src/monster-attack/monster-attack-processor.cpp
index 5a71262..82d45e3 100644 (file)
--- a/src/monster-attack/monster-attack-processor.cpp
+++ b/src/monster-attack/monster-attack-processor.cpp
@@ -6,7 +6,6 @@
 
 #include "monster-attack/monster-attack-processor.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "melee/monster-attack-monster.h"
 #include "monster-attack/monster-attack-player.h"
@@ -17,6 +16,7 @@
 #include "monster/monster-processor-util.h"
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index e85f143..92a029d 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -4,7 +4,6 @@
 #include "cmd-building/cmd-building.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest-completion-checker.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
@@ -39,6 +38,7 @@
 #include "sv-definition/sv-scroll-types.h"
 #include "system/artifact-type-definition.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/monster-floor/monster-generator.cpp b/src/monster-floor/monster-generator.cpp
index 57e8d82..ab6e359 100644 (file)
--- a/src/monster-floor/monster-generator.cpp
+++ b/src/monster-floor/monster-generator.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "monster-floor/monster-generator.h"
-#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/cave.h"
 #include "floor/floor-util.h"
@@ -28,6 +27,7 @@
 #include "monster/smart-learn-types.h"
 #include "mspell/summon-checker.h"
 #include "spell/summon-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/monster-floor/monster-lite.cpp b/src/monster-floor/monster-lite.cpp
index 4244cc0..8542081 100644 (file)
--- a/src/monster-floor/monster-lite.cpp
+++ b/src/monster-floor/monster-lite.cpp
@@ -1,7 +1,6 @@
 #include "monster-floor/monster-lite.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "grid/feature-flag-types.h"
 #include "grid/grid.h"
@@ -12,6 +11,7 @@
 #include "player-base/player-class.h"
 #include "player-info/ninja-data-type.h"
 #include "player/special-defense-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/monster-floor/monster-summon.cpp b/src/monster-floor/monster-summon.cpp
index c0c2251..d669b4c 100644 (file)
--- a/src/monster-floor/monster-summon.cpp
+++ b/src/monster-floor/monster-summon.cpp
@@ -1,6 +1,5 @@
 #include "monster-floor/monster-summon.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "floor/wild.h"
 #include "main/sound-definitions-table.h"
@@ -17,6 +16,7 @@
 #include "monster/monster-util.h"
 #include "mspell/summon-checker.h"
 #include "spell/summon-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/monster-race/monster-race-hook.cpp b/src/monster-race/monster-race-hook.cpp
index d20b3ed..5e7f647 100644 (file)
--- a/src/monster-race/monster-race-hook.cpp
+++ b/src/monster-race/monster-race-hook.cpp
@@ -1,5 +1,4 @@
 #include "monster-race/monster-race-hook.h"
-#include "dungeon/dungeon.h"
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-table.h"
 #include "monster-race/monster-race.h"
@@ -14,6 +13,7 @@
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
 #include "player/player-status.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/monster/monster-list.cpp b/src/monster/monster-list.cpp
index d371f26..efededa 100644 (file)
--- a/src/monster/monster-list.cpp
+++ b/src/monster/monster-list.cpp
@@ -13,7 +13,6 @@
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/floor-object.h"
 #include "floor/geometry.h"
@@ -36,6 +35,7 @@
 #include "pet/pet-fall-off.h"
 #include "player/player-status.h"
 #include "system/alloc-entries.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp
index 053a2da..9037c0c 100644 (file)
--- a/src/monster/monster-update.cpp
+++ b/src/monster/monster-update.cpp
@@ -10,7 +10,6 @@
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/geometry.h"
 #include "game-option/birth-options.h"
@@ -35,6 +34,7 @@
 #include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
 #include "status/element-resistance.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/monster/monster-util.cpp b/src/monster/monster-util.cpp
index d40fc56..3673c1c 100644 (file)
--- a/src/monster/monster-util.cpp
+++ b/src/monster/monster-util.cpp
@@ -1,6 +1,5 @@
 #include "monster/monster-util.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/wild.h"
 #include "game-option/cheat-options.h"
@@ -14,6 +13,7 @@
 #include "monster-race/race-indice-types.h"
 #include "spell/summon-types.h"
 #include "system/alloc-entries.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/mspell/mspell-attack.cpp b/src/mspell/mspell-attack.cpp
index 0062371..a1c2be8 100644 (file)
--- a/src/mspell/mspell-attack.cpp
+++ b/src/mspell/mspell-attack.cpp
@@ -3,7 +3,6 @@
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "monster-floor/monster-move.h"
@@ -29,6 +28,7 @@
 #include "player/attack-defense-types.h"
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index 3d61119..8df8ead 100644 (file)
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -14,7 +14,6 @@
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
@@ -47,6 +46,7 @@
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/range-calc.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/mspell/mspell-judgement.cpp b/src/mspell/mspell-judgement.cpp
index b8baeae..84ef77c 100644 (file)
--- a/src/mspell/mspell-judgement.cpp
+++ b/src/mspell/mspell-judgement.cpp
@@ -10,7 +10,6 @@
  */
 
 #include "mspell/mspell-judgement.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
 #include "floor/cave.h"
@@ -32,6 +31,7 @@
 #include "realm/realm-song-numbers.h"
 #include "spell-realm/spells-song.h"
 #include "spell/range-calc.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/mspell/mspell-lite.cpp b/src/mspell/mspell-lite.cpp
index b25a8b5..4383e14 100644 (file)
--- a/src/mspell/mspell-lite.cpp
+++ b/src/mspell/mspell-lite.cpp
@@ -6,7 +6,6 @@
 
 #include "mspell/mspell-lite.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/geometry.h"
 #include "floor/line-of-sight.h"
@@ -20,6 +19,7 @@
 #include "mspell/mspell-judgement.h"
 #include "player-base/player-class.h"
 #include "spell/range-calc.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index 337b129..1d995b6 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -2,7 +2,6 @@
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "floor/geometry.h"
 #include "grid/grid.h"
@@ -41,6 +40,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/object-enchant/item-magic-applier.cpp b/src/object-enchant/item-magic-applier.cpp
index 796644f..7dd2c2f 100644 (file)
--- a/src/object-enchant/item-magic-applier.cpp
+++ b/src/object-enchant/item-magic-applier.cpp
@@ -6,7 +6,6 @@
 
 #include "object-enchant/item-magic-applier.h"
 #include "artifact/fixed-art-generator.h"
-#include "dungeon/dungeon.h"
 #include "object-enchant/enchanter-base.h"
 #include "object-enchant/enchanter-factory.h"
 #include "object-enchant/item-apply-magic.h"
@@ -15,6 +14,7 @@
 #include "player/player-status-flags.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index a6000f2..dfb797c 100644 (file)
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -3,7 +3,6 @@
 #include "core/asking-player.h"
 #include "core/disturbance.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/cave.h"
@@ -28,6 +27,7 @@
 #include "player/player-status-resist.h"
 #include "player/special-defense-types.h"
 #include "status/element-resistance.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index 7cde7b9..65604ba 100644 (file)
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -9,7 +9,6 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
@@ -59,6 +58,7 @@
 #include "status/base-status.h"
 #include "status/element-resistance.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp
index e000609..75fae29 100644 (file)
--- a/src/player/player-move.cpp
+++ b/src/player/player-move.cpp
@@ -13,7 +13,6 @@
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
@@ -40,6 +39,7 @@
 #include "spell-kind/spells-floor.h"
 #include "spell-realm/spells-song.h"
 #include "status/action-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 37dc7f9..9f3914f 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -14,7 +14,6 @@
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/cave.h"
 #include "floor/floor-events.h"
@@ -103,6 +102,7 @@
 #include "status/base-status.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-weapon-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/racial/racial-vampire.cpp b/src/racial/racial-vampire.cpp
index ceee882..14b46d7 100644 (file)
--- a/src/racial/racial-vampire.cpp
+++ b/src/racial/racial-vampire.cpp
@@ -1,11 +1,11 @@
 #include "racial/racial-vampire.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "hpmp/hp-mp-processor.h"
 #include "player/digestion-processor.h"
 #include "player/player-status.h"
 #include "spell-kind/spells-specific-bolt.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp
index 98fa620..f9a53b1 100644 (file)
--- a/src/realm/realm-hissatsu.cpp
+++ b/src/realm/realm-hissatsu.cpp
@@ -9,7 +9,6 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
@@ -42,6 +41,7 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/technic-info-table.h"
 #include "status/bad-status-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/room/cave-filler.cpp b/src/room/cave-filler.cpp
index e3da875..4ad3c36 100644 (file)
--- a/src/room/cave-filler.cpp
+++ b/src/room/cave-filler.cpp
@@ -6,12 +6,12 @@
 
 #include "room/cave-filler.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor//geometry.h"
 #include "floor/cave.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "room/lake-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/room-generator.cpp b/src/room/room-generator.cpp
index c8019ab..c83a54c 100644 (file)
--- a/src/room/room-generator.cpp
+++ b/src/room/room-generator.cpp
@@ -1,6 +1,5 @@
 #include "room/room-generator.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-types.h"
 #include "room/door-definition.h"
@@ -14,6 +13,7 @@
 #include "room/rooms-trap.h"
 #include "room/rooms-vault.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-builder.cpp b/src/room/rooms-builder.cpp
index c69b253..1dfc733 100644 (file)
--- a/src/room/rooms-builder.cpp
+++ b/src/room/rooms-builder.cpp
@@ -37,7 +37,6 @@
 
 #include "room/rooms-builder.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "grid/door.h"
 #include "grid/feature.h"
@@ -45,6 +44,7 @@
 #include "room/cave-filler.h"
 #include "room/door-definition.h"
 #include "room/lake-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-fractal.cpp b/src/room/rooms-fractal.cpp
index 3d16d17..765a29f 100644 (file)
--- a/src/room/rooms-fractal.cpp
+++ b/src/room/rooms-fractal.cpp
@@ -1,10 +1,10 @@
 #include "room/rooms-fractal.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-generator.h"
 #include "room/cave-filler.h"
 #include "room/rooms-normal.h"
 #include "room/space-finder.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-maze-vault.cpp b/src/room/rooms-maze-vault.cpp
index 5d4e4e9..86eb6e3 100644 (file)
--- a/src/room/rooms-maze-vault.cpp
+++ b/src/room/rooms-maze-vault.cpp
@@ -1,9 +1,9 @@
 #include "room/rooms-maze-vault.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "game-option/cheat-types.h"
 #include "grid/grid.h"
 #include "room/treasure-deployment.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-normal.cpp b/src/room/rooms-normal.cpp
index ac1b6f9..50194c1 100644 (file)
--- a/src/room/rooms-normal.cpp
+++ b/src/room/rooms-normal.cpp
@@ -1,6 +1,5 @@
 #include "room/rooms-normal.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "grid/door.h"
 #include "grid/grid.h"
@@ -11,6 +10,7 @@
 #include "room/rooms-builder.h"
 #include "room/space-finder.h"
 #include "room/vault-builder.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-pit-nest.cpp b/src/room/rooms-pit-nest.cpp
index cdbbec1..2d3ab1e 100644 (file)
--- a/src/room/rooms-pit-nest.cpp
+++ b/src/room/rooms-pit-nest.cpp
@@ -1,5 +1,4 @@
 #include "room/rooms-pit-nest.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-generator.h"
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"
@@ -20,6 +19,7 @@
 #include "monster/monster-util.h"
 #include "room/door-definition.h"
 #include "room/space-finder.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/room/rooms-special.cpp b/src/room/rooms-special.cpp
index bd61067..92c52b0 100644 (file)
--- a/src/room/rooms-special.cpp
+++ b/src/room/rooms-special.cpp
@@ -1,6 +1,5 @@
 #include "room/rooms-special.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor//geometry.h"
 #include "floor/floor-generator.h"
 #include "game-option/cheat-types.h"
@@ -18,6 +17,7 @@
 #include "object/object-kind-hook.h"
 #include "room/door-definition.h"
 #include "room/space-finder.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-trap.cpp b/src/room/rooms-trap.cpp
index d4e5f09..95c28aa 100644 (file)
--- a/src/room/rooms-trap.cpp
+++ b/src/room/rooms-trap.cpp
@@ -1,12 +1,12 @@
 #include "room/rooms-trap.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-generator.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "room/space-finder.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/rooms-vault.cpp b/src/room/rooms-vault.cpp
index 1f07304..98bf0e5 100644 (file)
--- a/src/room/rooms-vault.cpp
+++ b/src/room/rooms-vault.cpp
@@ -6,7 +6,6 @@
 
 #include "room/rooms-vault.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/floor-generator-util.h"
 #include "floor/floor-generator.h"
@@ -31,6 +30,7 @@
 #include "store/store-util.h"
 #include "store/store.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/room/space-finder.cpp b/src/room/space-finder.cpp
index 372c13f..330821b 100644 (file)
--- a/src/room/space-finder.cpp
+++ b/src/room/space-finder.cpp
@@ -1,9 +1,9 @@
 #include "room/space-finder.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "grid/grid.h"
 #include "system/dungeon-data-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/save/player-writer.cpp b/src/save/player-writer.cpp
index b26ff10..35ff417 100644 (file)
--- a/src/save/player-writer.cpp
+++ b/src/save/player-writer.cpp
@@ -1,6 +1,5 @@
 #include "save/player-writer.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "player-base/player-class.h"
 #include "player/player-skill.h"
@@ -8,6 +7,7 @@
 #include "save/player-class-specific-data-writer.h"
 #include "save/save-util.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "timed-effect/player-acceleration.h"

diff --git a/src/specific-object/torch.cpp b/src/specific-object/torch.cpp
index c33a739..00ee3f2 100644 (file)
--- a/src/specific-object/torch.cpp
+++ b/src/specific-object/torch.cpp
@@ -1,7 +1,6 @@
 #include "specific-object/torch.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"
@@ -12,6 +11,7 @@
 #include "object/tval-types.h"
 #include "player/special-defense-types.h"
 #include "sv-definition/sv-lite-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/spell-class/spells-mirror-master.cpp b/src/spell-class/spells-mirror-master.cpp
index 0f9fdbf..1616094 100644 (file)
--- a/src/spell-class/spells-mirror-master.cpp
+++ b/src/spell-class/spells-mirror-master.cpp
@@ -9,7 +9,6 @@
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-feature.h"
@@ -28,6 +27,7 @@
 #include "monster/monster-update.h"
 #include "pet/pet-util.h"
 #include "spell-kind/spells-teleport.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/spell-kind/earthquake.cpp b/src/spell-kind/earthquake.cpp
index 2a828bc..9749688 100644 (file)
--- a/src/spell-kind/earthquake.cpp
+++ b/src/spell-kind/earthquake.cpp
@@ -3,7 +3,6 @@
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-object.h"
@@ -31,6 +30,7 @@
 #include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
 #include "status/bad-status-setter.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/spell-kind/spells-detection.cpp b/src/spell-kind/spells-detection.cpp
index 5a36a94..c826d6f 100644 (file)
--- a/src/spell-kind/spells-detection.cpp
+++ b/src/spell-kind/spells-detection.cpp
@@ -1,7 +1,6 @@
 #include "spell-kind/spells-detection.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/floor-save-util.h"
 #include "floor/geometry.h"
@@ -21,6 +20,7 @@
 #include "realm/realm-song-numbers.h"
 #include "realm/realm-song.h"
 #include "spell-realm/spells-song.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index 46e1742..1a62542 100644 (file)
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -11,7 +11,6 @@
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/attribute-types.h"
 #include "flavor/flavor-describer.h"
@@ -46,6 +45,7 @@
 #include "spell-kind/spells-teleport.h"
 #include "status/bad-status-setter.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/spell-kind/spells-grid.cpp b/src/spell-kind/spells-grid.cpp
index 9e1301e..0960009 100644 (file)
--- a/src/spell-kind/spells-grid.cpp
+++ b/src/spell-kind/spells-grid.cpp
@@ -1,5 +1,4 @@
 #include "spell-kind/spells-grid.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-object.h"
@@ -9,6 +8,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "grid/stair.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/spell-kind/spells-lite.cpp b/src/spell-kind/spells-lite.cpp
index 60b6568..af808f5 100644 (file)
--- a/src/spell-kind/spells-lite.cpp
+++ b/src/spell-kind/spells-lite.cpp
@@ -1,6 +1,5 @@
 #include "spell-kind/spells-lite.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "effect/attribute-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
@@ -19,6 +18,7 @@
 #include "monster/monster-update.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-launcher.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index 36fd4f3..42bf905 100644 (file)
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -8,7 +8,6 @@
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest-completion-checker.h"
 #include "floor/cave.h"
 #include "floor/floor-mode-changer.h"
@@ -28,6 +27,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index ce22821..4fb5459 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -4,7 +4,6 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "floor/cave.h"
 #include "floor/floor-events.h"
@@ -25,6 +24,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index f6db3e3..9255cd0 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -1,5 +1,4 @@
 #include "store/rumor.h"
-#include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/floor-town.h"
@@ -10,6 +9,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object/object-kind-hook.h"
 #include "system/artifact-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/monster-race-definition.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/dungeon/dungeon.cpp b/src/system/dungeon-info.cpp
similarity index 81%
rename from src/dungeon/dungeon.cpp
rename to src/system/dungeon-info.cpp
index 5521c67..310b5f3 100644 (file)
--- a/src/dungeon/dungeon.cpp
+++ b/src/system/dungeon-info.cpp
@@ -1,4 +1,4 @@
-#include "dungeon/dungeon.h"
+#include "system/dungeon-info.h"
 
 /*
  * The dungeon arrays

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

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 20424d9..573a83e 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -1,7 +1,6 @@
 #include "target/target-describer.h"
 #include "action/travel-execution.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "floor/cave.h"
@@ -27,6 +26,7 @@
 #include "player-base/player-race.h"
 #include "player/player-status-table.h"
 #include "system/building-type-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index a978e42..e35c1c4 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -22,7 +22,6 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
@@ -81,6 +80,7 @@
 #include "system/angband-version.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/world/world-movement-processor.cpp b/src/world/world-movement-processor.cpp
index 657b084..6890800 100644 (file)
--- a/src/world/world-movement-processor.cpp
+++ b/src/world/world-movement-processor.cpp
@@ -2,7 +2,6 @@
 #include "cmd-io/cmd-save.h"
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
-#include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-mode-changer.h"
 #include "game-option/birth-options.h"
@@ -13,6 +12,7 @@
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/world/world-object.cpp b/src/world/world-object.cpp
index b384dde..540f429 100644 (file)
--- a/src/world/world-object.cpp
+++ b/src/world/world-object.cpp
@@ -1,10 +1,10 @@
 #include "world/world-object.h"
 #include "dungeon/dungeon-flag-types.h"
-#include "dungeon/dungeon.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object/tval-types.h"
 #include "system/alloc-entries.h"
 #include "system/baseitem-info-definition.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index 43073f8..8c13d57 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -3,7 +3,6 @@
 #include "cmd-io/cmd-save.h"
 #include "core/disturbance.h"
 #include "core/magic-effects-timeout-reducer.h"
-#include "dungeon/dungeon.h"
 #include "floor/floor-events.h"
 #include "floor/floor-mode-changer.h"
 #include "floor/wild.h"
@@ -31,6 +30,7 @@
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-type-definition.h"