From: Hourier <hourier@users.sourceforge.jp>
Date: Sat, 18 Jul 2020 05:48:17 +0000 (+0900)
Subject: [Refactor] #40532 Moved save.c/h from savedata/ to save/
X-Git-Tag: vmacos3.0.0-alpha52~782^2~115
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5fceaded27bad01938a58b784285e3eb3e9f06a0;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #40532 Moved save.c/h from savedata/ to save/
---

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index d21ddf77c..8f08760d6 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1157,7 +1157,7 @@
     <ClCompile Include="..\..\src\room\rooms.c" />
     <ClCompile Include="..\..\src\room\pit-nest-kinds-table.c" />
     <ClCompile Include="..\..\src\store\rumor.c" />
-    <ClCompile Include="..\..\src\savedata\save.c" />
+    <ClCompile Include="..\..\src\save\save.c" />
     <ClCompile Include="..\..\src\core\scores.c" />
     <ClCompile Include="..\..\src\player\selfinfo.c" />
     <ClCompile Include="..\..\src\io\signal-handlers.c" />
@@ -1427,7 +1427,7 @@
     <ClInclude Include="..\..\src\room\rooms-vault.h" />
     <ClInclude Include="..\..\src\room\rooms.h" />
     <ClInclude Include="..\..\src\store\rumor.h" />
-    <ClInclude Include="..\..\src\savedata\save.h" />
+    <ClInclude Include="..\..\src\save\save.h" />
     <ClInclude Include="..\..\src\core\scores.h" />
     <ClInclude Include="..\..\src\player\selfinfo.h" />
     <ClInclude Include="..\..\src\mind\mind-sniper.h" />
diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5b5d5f348..9aed79ba9 100644
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1535,9 +1535,6 @@
     <ClCompile Include="..\..\src\spell-kind\magic-item-recharger.c">
       <Filter>spell-kind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\savedata\save.c">
-      <Filter>savedata</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\savedata\load.c">
       <Filter>savedata</Filter>
     </ClCompile>
@@ -1784,6 +1781,9 @@
     <ClCompile Include="..\..\src\floor\cave.c">
       <Filter>floor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\save\save.c">
+      <Filter>save</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3607,9 +3607,6 @@
     <ClInclude Include="..\..\src\spell-kind\magic-item-recharger.h">
       <Filter>spell-kind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\savedata\save.h">
-      <Filter>savedata</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\savedata\load.h">
       <Filter>savedata</Filter>
     </ClInclude>
@@ -3898,6 +3895,9 @@
     <ClInclude Include="..\..\src\floor\cave.h">
       <Filter>floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\save\save.h">
+      <Filter>save</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -4087,6 +4087,9 @@
     <Filter Include="racial">
       <UniqueIdentifier>{aaa1b0db-fb73-43df-b204-45c07a934cd5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="save">
+      <UniqueIdentifier>{beb4a41a-dee4-4bdd-ac20-78da62c44fdf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />
diff --git a/src/Makefile.am b/src/Makefile.am
index 81503ed7c..bb8c09869 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -562,6 +562,8 @@ hengband_SOURCES = \
 	room/rooms-pit-nest.c room/rooms-pit-nest.h \
 	room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
 	\
+	save/save.c save/save.h \
+	\
 	savedata/angband-version-comparer.c savedata/angband-version-comparer.h \
 	savedata/birth-loader.c savedata/birth-loader.h \
 	savedata/dummy-loader.c savedata/dummy-loader.h \
@@ -583,7 +585,6 @@ hengband_SOURCES = \
 	savedata/player-attack-loader.c savedata/player-attack-loader. \
 	savedata/player-info-loader.c savedata/player-info-loader.h \
 	savedata/savedata-flag-types.h \
-	savedata/save.c savedata/save.h \
 	savedata/store-loader.c savedata/store-loader.h \
 	savedata/world-loader.c savedata/world-loader.h \
 	\
@@ -767,7 +768,7 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	-Imarket -Imelee -Imind -Imonster -Imonster-attack -Imonster-floor \
 	-Imonster-race -Ilore -Imspell -Imutation -Iobject -Iobject-enchant \
 	-Iobject-hook -Iobject-use -Ipet -Iplayer -Iplayer-attack -Iracial -Irealm \
-	-Iroom -Isavedata -Ispecific-object -Ispell -Ispell-kind -Ispell-realm \
+	-Iroom -Isave -Isavedata -Ispecific-object -Ispell -Ispell-kind -Ispell-realm \
 	-Istatus -Isv-definition -Isystem -Iterm -Iutil -Iview -Iwindow -Iwizard \
 	-Iworld
 
diff --git a/src/cmd-io/cmd-save.c b/src/cmd-io/cmd-save.c
index 155c82fcf..f709dc5a4 100644
--- a/src/cmd-io/cmd-save.c
+++ b/src/cmd-io/cmd-save.c
@@ -5,7 +5,7 @@
 #include "io/signal-handlers.h"
 #include "io/write-diary.h"
 #include "monster/monster-status.h" // 違和感。要調査.
-#include "savedata/save.h"
+#include "save/save.h"
 #include "term/screen-processor.h"
 #include "view/display-messages.h"
 #include "world/world.h"
diff --git a/src/core/game-closer.c b/src/core/game-closer.c
index 1c372978d..91b2b1c5c 100644
--- a/src/core/game-closer.c
+++ b/src/core/game-closer.c
@@ -10,7 +10,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "player/process-death.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "term/screen-processor.h"
 #include "util/angband-files.h"
 #include "util/int-char-converter.h"
diff --git a/src/core/game-play.c b/src/core/game-play.c
index 748d51a55..22f135ec4 100644
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -65,7 +65,7 @@
 #include "player/process-name.h"
 #include "racial/racial-android.h"
 #include "realm/realm-names-table.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "spell/spells-status.h"
 #include "spell/technic-info-table.h"
 #include "store/home.h"
diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 0b5a2e048..08054fef0 100644
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -56,7 +56,7 @@
 #include "player/player-personalities-types.h"
 #include "player/special-defense-types.h"
 #include "savedata/floor-loader.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "spell-kind/spells-floor.h"
 #include "system/artifact-type-definition.h"
 #include "system/floor-type-definition.h"
diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index da05a8923..f31b954c7 100644
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -10,7 +10,7 @@
 #include "core/game-closer.h"
 #include "floor/floor-events.h"
 #include "io/write-diary.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "system/system-variables.h"
 #include "term/term-color-types.h"
 #include "world/world.h"
diff --git a/src/main-win.c b/src/main-win.c
index e04f7bd50..63ff142f9 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -129,8 +129,7 @@
 
 #ifdef WINDOWS
 #include "dungeon/dungeon.h"
-#include "savedata/save.h"
-#include "term/z-term.h"
+#include "save/save.h"
 #include <direct.h>
 #include <locale.h>
 #include <windows.h>
diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 9a60fd898..3c2345e3c 100644
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -48,7 +48,7 @@
 #include "player/race-info-table.h"
 #include "player/special-defense-types.h"
 #include "racial/racial-android.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "status/base-status.h"
 #include "status/element-resistance.h"
 #include "system/floor-type-definition.h"
diff --git a/src/savedata/save.c b/src/save/save.c
similarity index 99%
rename from src/savedata/save.c
rename to src/save/save.c
index 941544bba..e5ea7fe1e 100644
--- a/src/savedata/save.c
+++ b/src/save/save.c
@@ -11,7 +11,7 @@
  * </pre>
  */
 
-#include "savedata/save.h"
+#include "save/save.h"
 #include "birth/quick-start.h"
 #include "cmd-building/cmd-building.h"
 #include "core/player-update-types.h"
diff --git a/src/savedata/save.h b/src/save/save.h
similarity index 100%
rename from src/savedata/save.h
rename to src/save/save.h
diff --git a/src/savedata/dungeon-loader.c b/src/savedata/dungeon-loader.c
index ac1dc1914..fc6d42214 100644
--- a/src/savedata/dungeon-loader.c
+++ b/src/savedata/dungeon-loader.c
@@ -8,7 +8,7 @@
 #include "savedata/floor-loader.h"
 #include "savedata/load-util.h"
 #include "savedata/load-v1-5-0.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "system/floor-type-definition.h"
 #include "world/world.h"
 
diff --git a/src/savedata/floor-loader.c b/src/savedata/floor-loader.c
index 1c3738fde..f996fed3c 100644
--- a/src/savedata/floor-loader.c
+++ b/src/savedata/floor-loader.c
@@ -15,7 +15,7 @@
 #include "savedata/load-util.h"
 #include "savedata/load-v1-5-0.h"
 #include "savedata/old-feature-types.h"
-#include "savedata/save.h"
+#include "save/save.h"
 #include "system/angband-version.h"
 #include "system/floor-type-definition.h"
 #include "system/object-type-definition.h"