[Refactor] #1796 Renamed savedata10-*.h to *-savefile10.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0c7d4a4..b80ae74 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -927,7 +927,7 @@
     <ClInclude Include="..\..\src\load\item\item-loader-version-types.h" />\r
     <ClInclude Include="..\..\src\load\item\item-loader-base.h" />\r
     <ClInclude Include="..\..\src\load\item\item-loader-factory.h" />\r
-    <ClInclude Include="..\..\src\load\old\savedata10-monster-flag-types.h" />\r
+    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile10.h" />\r
     <ClInclude Include="..\..\src\load\player-class-specific-data-loader.h" />\r
     <ClInclude Include="..\..\src\load\savedata-old-flag-types.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-aura-types.h" />\r
@@ -1256,7 +1256,7 @@
     <ClInclude Include="..\..\src\load\option-loader.h" />\r
     <ClInclude Include="..\..\src\load\player-attack-loader.h" />\r
     <ClInclude Include="..\..\src\load\player-info-loader.h" />\r
-    <ClInclude Include="..\..\src\load\old\savedata10-item-flag-types.h" />\r
+    <ClInclude Include="..\..\src\load\old\item-flag-types-savefile10.h" />\r
     <ClInclude Include="..\..\src\load\store-loader.h" />\r
     <ClInclude Include="..\..\src\load\world-loader.h" />\r
     <ClInclude Include="..\..\src\racial\racial-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 1085959..6502d87 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -5124,10 +5124,10 @@
     <ClInclude Include="..\..\src\load\old\monster-loader-savefile10.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\savedata10-item-flag-types.h">\r
+    <ClInclude Include="..\..\src\load\old\item-flag-types-savefile10.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\savedata10-monster-flag-types.h">\r
+    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile10.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\load\item\item-loader-base.h">\r

diff --git a/src/Makefile.am b/src/Makefile.am
index eb56fba..be396ae 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -353,7 +353,6 @@ hengband_SOURCES = \
        load/player-attack-loader.cpp load/player-attack-loader.h \
        load/player-class-specific-data-loader.cpp load/player-class-specific-data-loader.h \
        load/player-info-loader.cpp load/player-info-loader.h \
-       load/savedata-flag-types.h \
        load/savedata-old-flag-types.h \
        load/store-loader.cpp load/store-loader.h \
        load/world-loader.cpp load/world-loader.h \
@@ -362,9 +361,11 @@ hengband_SOURCES = \
        load/item/item-loader-factory.cpp load/item/item-loader-factory.h \
        load/item/item-loader-version-types.h \
        \
+       load/old/item-flag-types-savefile10.h \
        load/old/item-loader-savefile10.cpp load/old/item-loader-savefile10.h \
        load/old/load-v1-5-0.cpp load/old/load-v1-5-0.h \
        load/old/load-v1-7-0.cpp load/old/load-v1-7-0.h \
+       load/old/monster-flag-types-savefile10.h \
        load/old/monster-loader-savefile10.cpp load/old/monster-loader-savefile10.h \
        \
        locale/english.cpp locale/english.h \

diff --git a/src/load/old/savedata10-item-flag-types.h b/src/load/old/item-flag-types-savefile10.h
similarity index 100%
rename from src/load/old/savedata10-item-flag-types.h
rename to src/load/old/item-flag-types-savefile10.h

diff --git a/src/load/old/item-loader-savefile10.cpp b/src/load/old/item-loader-savefile10.cpp
index 11b7d77..40d4e86 100644 (file)
--- a/src/load/old/item-loader-savefile10.cpp
+++ b/src/load/old/item-loader-savefile10.cpp
@@ -4,7 +4,7 @@
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
-#include "load/old/savedata10-item-flag-types.h"
+#include "load/old/item-flag-types-savefile10.h"
 #include "load/savedata-old-flag-types.h"
 #include "object-enchant/object-ego.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/load/old/savedata10-monster-flag-types.h b/src/load/old/monster-flag-types-savefile10.h
similarity index 100%
rename from src/load/old/savedata10-monster-flag-types.h
rename to src/load/old/monster-flag-types-savefile10.h

diff --git a/src/load/old/monster-loader-savefile10.cpp b/src/load/old/monster-loader-savefile10.cpp
index d57a0bc..0578b16 100644 (file)
--- a/src/load/old/monster-loader-savefile10.cpp
+++ b/src/load/old/monster-loader-savefile10.cpp
@@ -2,7 +2,7 @@
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
-#include "load/old/savedata10-monster-flag-types.h"
+#include "load/old/monster-flag-types-savefile10.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index 174f5d9..6ce0c9e 100644 (file)
--- a/src/save/item-writer.cpp
+++ b/src/save/item-writer.cpp
@@ -1,6 +1,6 @@
 #include "save/item-writer.h"
 #include "artifact/random-art-effects.h"
-#include "load/old/savedata10-item-flag-types.h"
+#include "load/old/item-flag-types-savefile10.h"
 #include "object/object-kind.h"
 #include "save/save-util.h"
 #include "system/object-type-definition.h"

diff --git a/src/save/monster-writer.cpp b/src/save/monster-writer.cpp
index 747777a..916801c 100644 (file)
--- a/src/save/monster-writer.cpp
+++ b/src/save/monster-writer.cpp
@@ -1,5 +1,5 @@
 #include "save/monster-writer.h"
-#include "load/old/savedata10-monster-flag-types.h"
+#include "load/old/monster-flag-types-savefile10.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"