[Refactor] #38862 Moved save/load.c/h to io/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 6d33be6..6c4e53b 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -448,7 +448,7 @@
     <ClCompile Include="..\..\src\grid.c" />\r
     <ClCompile Include="..\..\src\inet.c" />\r
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
-    <ClCompile Include="..\..\src\load.c" />\r
+    <ClCompile Include="..\..\src\io\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
     <ClCompile Include="..\..\src\mind.c" />\r
     <ClCompile Include="..\..\src\monster\monster1.c" />\r
@@ -479,7 +479,7 @@
     <ClCompile Include="..\..\src\room\rooms.c" />\r
     <ClCompile Include="..\..\src\room\pit-nest-kinds-table.c" />\r
     <ClCompile Include="..\..\src\rumor.c" />\r
-    <ClCompile Include="..\..\src\save.c" />\r
+    <ClCompile Include="..\..\src\io\save.c" />\r
     <ClCompile Include="..\..\src\scores.c" />\r
     <ClCompile Include="..\..\src\selfinfo.c" />\r
     <ClCompile Include="..\..\src\io\signal-handlers.c" />\r
@@ -647,7 +647,7 @@
     <ClInclude Include="..\..\src\history.h" />\r
     <ClInclude Include="..\..\src\inet.h" />\r
     <ClInclude Include="..\..\src\init.h" />\r
-    <ClInclude Include="..\..\src\load.h" />\r
+    <ClInclude Include="..\..\src\io\load.h" />\r
     <ClInclude Include="..\..\src\mind.h" />\r
     <ClInclude Include="..\..\src\monster\monster-process.h" />\r
     <ClInclude Include="..\..\src\spell\monster-spell.h" />\r
@@ -701,7 +701,7 @@
     <ClInclude Include="..\..\src\room\rooms-vault.h" />\r
     <ClInclude Include="..\..\src\room\rooms.h" />\r
     <ClInclude Include="..\..\src\rumor.h" />\r
-    <ClInclude Include="..\..\src\save.h" />\r
+    <ClInclude Include="..\..\src\io\save.h" />\r
     <ClInclude Include="..\..\src\scores.h" />\r
     <ClInclude Include="..\..\src\selfinfo.h" />\r
     <ClInclude Include="..\..\src\snipe.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8630dcb..e978304 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -37,12 +37,6 @@
     <ClCompile Include="..\..\src\rumor.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\load.c">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\save.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mind.c">
       <Filter>spell</Filter>
     </ClCompile>
@@ -829,6 +823,12 @@
     <ClCompile Include="..\..\src\locale\japanese.c">
       <Filter>locale</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\io\save.c">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\io\load.c">
+      <Filter>io</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -903,12 +903,6 @@
     <ClInclude Include="..\..\src\z-rand.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\save.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\load.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\racial.h">
       <Filter>cmd</Filter>
     </ClInclude>
@@ -1701,6 +1695,12 @@
     <ClInclude Include="..\src\locele\english.h">
       <Filter>locale</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\io\save.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\io\load.h">
+      <Filter>io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/birth/birth.c b/src/birth/birth.c
index 1132b06..d5a0cc8 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -52,7 +52,7 @@
 #include "player/race-info-table.h"
 #include "quest.h"
 #include "realm/realm.h"
-#include "save.h"
+#include "io/save.h"
 #include "spell/spells-util.h"
 #include "spell/spells-status.h"
 #include "view/display-main-window.h" // 暫定。後で消す.

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index a6f545c..0081e91 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -4,7 +4,7 @@
 #include "cmd/cmd-dump.h"
 #include "player/player-move.h"
 #include "core/stuff-handler.h"
-#include "save.h"
+#include "io/save.h"
 #include "world/world.h"
 #include "monster/monster-status.h" // 違和感。要調査.
 #include "gameterm.h"

diff --git a/src/core/game-closer.c b/src/core/game-closer.c
index be87d9b..d3edbd9 100644 (file)
--- a/src/core/game-closer.c
+++ b/src/core/game-closer.c
@@ -6,7 +6,7 @@
 #include "io/uid-checker.h"
 #include "main/music-definitions-table.h"
 #include "player/process-death.h"
-#include "save.h"
+#include "io/save.h"
 #include "scores.h"
 #include "view/display-main-window.h"
 #include "view/display-player.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index d029f4d..b2d4f3c 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -52,7 +52,7 @@
 #include "io/input-key-processor.h"
 #include "io/read-pref-file.h"
 #include "realm/realm.h"
-#include "save.h"
+#include "io/save.h"
 #include "scores.h"
 #include "targeting.h"
 #include "view/display-main-window.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 0230215..0eb7754 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "market/building.h"
 #include "system/system-variables.h"
-#include "load.h"
+#include "io/load.h"
 #include "util.h"
 
 #include "artifact.h"
@@ -42,7 +42,7 @@
 #include "spell/spells2.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "save.h"
+#include "io/save.h"
 #include "core/player-processor.h"
 
 #include "view/display-main-window.h"

diff --git a/src/load.c b/src/io/load.c
similarity index 99%
rename from src/load.c
rename to src/io/load.c
index b006e23..731e82c 100644 (file)
--- a/src/load.c
+++ b/src/io/load.c
@@ -45,7 +45,7 @@
 #include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
 #include "core/angband-version.h"
 
-#include "load.h"
+#include "io/load.h"
 #include "market/building.h"
 #include "report.h"
 
@@ -83,7 +83,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
-#include "save.h"
+#include "io/save.h"
 #include "locale/japanese.h"
 #include "cmd-smith.h"
 

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

diff --git a/src/save.c b/src/io/save.c
similarity index 99%
rename from src/save.c
rename to src/io/save.c
index 796d63b..2d992ae 100644 (file)
--- a/src/save.c
+++ b/src/io/save.c
@@ -13,8 +13,8 @@
 
 #include "system/angband.h"
 #include "util.h"
-#include "save.h"
-#include "load.h"
+#include "io/save.h"
+#include "io/load.h"
 #include "report.h"
 
 #include "core/angband-version.h"

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

diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index e4b38a0..fb014e3 100644 (file)
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -8,7 +8,7 @@
 #include "io/signal-handlers.h"
 #include "system/system-variables.h"
 #include "core/game-closer.h"
-#include "save.h"
+#include "io/save.h"
 #include "world/world.h"
 #include "gameterm.h"
 #include "io/write-diary.h"

diff --git a/src/main-win.c b/src/main-win.c
index 939cf05..c2a3d2d 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -123,7 +123,7 @@
 #include <direct.h>
 #include <locale.h>
 #include "z-term.h"
-#include "save.h"
+#include "io/save.h"
 #include "dungeon/dungeon.h"
 
 /*

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index bcd84ba..384e068 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -30,7 +30,7 @@
 #include "quest.h"
 #include "report.h"
 #include "wild.h"
-#include "save.h"
+#include "io/save.h"
 #include "files.h"
 
 /*!

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 53a602b..13e027c 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -51,7 +51,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "autopick/autopick-reader-writer.h"
-#include "save.h"
+#include "io/save.h"
 #include "report.h"
 
 #include "view/display-main-window.h"