[Refactor] #40460 Renamed dungeon-file.c/h to fixed-map-parser.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 2b74159..5d8c2e0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -394,7 +394,7 @@
     <ClCompile Include="..\..\src\system\system-variables.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r
     <ClCompile Include="..\..\src\monster\creature.c" />\r
-    <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
+    <ClCompile Include="..\..\src\info-reader\fixed-map-parser.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon.c" />\r
     <ClCompile Include="..\..\src\locale\english.c" />\r
     <ClCompile Include="..\..\src\grid\feature.c" />\r
@@ -929,7 +929,7 @@
     <ClInclude Include="..\..\src\system\angband.h" />\r
     <ClInclude Include="..\..\src\system\system-variables.h" />\r
     <ClInclude Include="..\..\src\monster\creature.h" />\r
-    <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
+    <ClInclude Include="..\..\src\info-reader\fixed-map-parser.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
     <ClInclude Include="..\..\src\grid\feature.h" />\r
     <ClInclude Include="..\..\src\io\files-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index fd4c6f1..79e143d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -422,9 +422,6 @@
     <ClCompile Include="..\..\src\dungeon\dungeon.c">
       <Filter>dungeon</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\dungeon\dungeon-file.c">
-      <Filter>dungeon</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\core\game-play.c">
       <Filter>core</Filter>
     </ClCompile>
@@ -1232,6 +1229,9 @@
     <ClCompile Include="..\..\src\floor\fixed-map-generator.c">
       <Filter>floor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\info-reader\fixed-map-parser.c">
+      <Filter>info-reader</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -1693,9 +1693,6 @@
     <ClInclude Include="..\..\src\dungeon\dungeon.h">
       <Filter>dungeon</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\dungeon\dungeon-file.h">
-      <Filter>dungeon</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\game-play.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -2629,6 +2626,9 @@
     <ClInclude Include="..\..\src\floor\fixed-map-generator.h">
       <Filter>floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\info-reader\fixed-map-parser.h">
+      <Filter>info-reader</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6937752..54776ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,7 +111,6 @@ hengband_SOURCES = \
        \
        dungeon/dungeon.c dungeon/dungeon.h \
        dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
-       dungeon/dungeon-file.c dungeon/dungeon-file.h \
        dungeon/quest.h dungeon/quest.c \
        \
        effect/effect-feature.c effect/effect-feature.h \
@@ -159,6 +158,7 @@ hengband_SOURCES = \
        info-reader/ego-reader.c info-reader/ego-reader.h \
        info-reader/feature-info-tokens-table.c info-reader/feature-info-tokens-table.h \
        info-reader/feature-reader.c info-reader/feature-reader.h \
+       info-reader/fixed-map-parser.c info-reader/fixed-map-parser.h \
        info-reader/general-parser.c info-reader/general-parser.h \
        info-reader/info-reader-util.c info-reader/info-reader-util.h \
        info-reader/kind-info-tokens-table.c info-reader/kind-info-tokens-table.h \

diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c
index 8af66b2..7867102 100644 (file)
--- a/src/birth/game-play-initializer.c
+++ b/src/birth/game-play-initializer.c
@@ -1,5 +1,5 @@
 #include "birth/game-play-initializer.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8e80daf..446bd0f 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -19,7 +19,7 @@
 #include "combat/snipe.h"
 #include "core/output-updater.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index f02ef92..7d7b8f2 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -49,7 +49,7 @@
 #include "core/game-closer.h"
 #include "core/output-updater.h"
 #include "core/player-processor.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon-processor.h"
 #include "io/input-key-processor.h"
 #include "io/read-pref-file.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index dbc674e..46bbe51 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -34,7 +34,7 @@
 #include "player/player-status.h"
 #include "floor/wild.h"
 #include "monster/monster-status.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "grid/feature.h"
 #include "world/world.h"
 #include "view/display-main-window.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 974d2cf..039501f 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -11,7 +11,7 @@
  */
 
 #include "floor/wild.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"

diff --git a/src/dungeon/dungeon-file.c b/src/info-reader/fixed-map-parser.c
similarity index 99%
rename from src/dungeon/dungeon-file.c
rename to src/info-reader/fixed-map-parser.c
index 216c487..f0f6b01 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/info-reader/fixed-map-parser.c
@@ -6,7 +6,7 @@
  * 2014 Deskull rearranged comment for Doxygen
  */
 
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "floor/fixed-map-generator.h"

diff --git a/src/dungeon/dungeon-file.h b/src/info-reader/fixed-map-parser.h
similarity index 100%
rename from src/dungeon/dungeon-file.h
rename to src/info-reader/fixed-map-parser.h

diff --git a/src/io/load.c b/src/io/load.c
index 4fb04a1..f105932 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -43,7 +43,7 @@
 #include "io/load.h"
 #include "birth/quick-start.h"
 #include "cmd-item/cmd-smith.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-generate.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index ca293ef..921dab4 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -14,7 +14,7 @@
 #include "cmd-building/cmd-building.h"
 #include "core/sort.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index 3f93b2d..3095b3a 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -10,7 +10,7 @@
 #include "dungeon/quest.h"
 #include "io/files-util.h"
 #include "dungeon/dungeon.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "world/world.h"
 #include "market/arena-info-table.h"
 

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 54d716b..b714e88 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -16,7 +16,7 @@
 #include "object/object-kind-hook.h"
 #include "object-enchant/special-object-flags.h"
 #include "dungeon/dungeon.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "core/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 1da7822..4ebc0f2 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -9,7 +9,7 @@
 #include "io-dump/dump-util.h"
 #include "player/avatar.h"
 #include "core/show-file.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "world/world.h"
 #include "store/store-util.h"
 #include "floor/floor-town.h"

diff --git a/src/main/init.c b/src/main/init.c
index 656d15b..cccf9c2 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -31,7 +31,7 @@
 
 #include "main/init.h"
 #include "cmd-building/cmd-building.h"
-#include "dungeon/dungeon-file.h" // 相互参照、後で何とかする.
+#include "info-reader/fixed-map-parser.h" // 相互参照、後で何とかする.
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"

diff --git a/src/market/building-quest.c b/src/market/building-quest.c
index d935d88..055ea9c 100644 (file)
--- a/src/market/building-quest.c
+++ b/src/market/building-quest.c
@@ -1,5 +1,5 @@
 #include "market/building-quest.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "market/building-util.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index fc7218c..6710c0c 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -7,7 +7,7 @@
  */
 
 #include "view/display-player.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "knowledge/knowledge-mutations.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index b1a63ef..40bfb54 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -17,7 +17,7 @@
 #include "cmd-io/cmd-save.h"
 #include "cmd/cmd-draw.h"
 #include "core/stuff-handler.h"
-#include "dungeon/dungeon-file.h"
+#include "info-reader/fixed-map-parser.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-object.h"