[Refactor] #1796 Moved monster-loader.cpp/h from load/ to load/old/ (これらのファイルはまだ現役)

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index aa429ea..4f25020 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -500,7 +500,7 @@
     <ClCompile Include="..\..\src\load\old\load-v1-7-0.cpp" />\r
     <ClCompile Include="..\..\src\load\load-zangband.cpp" />\r
     <ClCompile Include="..\..\src\load\lore-loader.cpp" />\r
-    <ClCompile Include="..\..\src\load\monster-loader.cpp" />\r
+    <ClCompile Include="..\..\src\load\old\monster-loader-savefile10.cpp" />\r
     <ClCompile Include="..\..\src\load\option-loader.cpp" />\r
     <ClCompile Include="..\..\src\load\player-attack-loader.cpp" />\r
     <ClCompile Include="..\..\src\load\player-info-loader.cpp" />\r
@@ -922,6 +922,7 @@
     <ClInclude Include="..\..\src\action\open-close-execution.h" />\r
     <ClInclude Include="..\..\src\action\open-util.h" />\r
     <ClInclude Include="..\..\src\action\run-execution.h" />\r
+    <ClInclude Include="..\..\src\load\old\savedata10-monster-flag-types.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
@@ -1245,12 +1246,12 @@
     <ClInclude Include="..\..\src\load\old\load-v1-5-0.h" />\r
     <ClInclude Include="..\..\src\load\load-zangband.h" />\r
     <ClInclude Include="..\..\src\load\lore-loader.h" />\r
-    <ClInclude Include="..\..\src\load\monster-loader.h" />\r
+    <ClInclude Include="..\..\src\load\old\monster-loader-savefile10.h" />\r
     <ClInclude Include="..\..\src\load\old-feature-types.h" />\r
     <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\savedata-flag-types.h" />\r
+    <ClInclude Include="..\..\src\load\old\savedata10-item-flag-types.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 c7f98e7..376fbde 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1457,9 +1457,6 @@
     <ClCompile Include="..\..\src\load\load-util.cpp">\r
       <Filter>load</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\load\monster-loader.cpp">\r
-      <Filter>load</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\load\load-zangband.cpp">\r
       <Filter>load</Filter>\r
     </ClCompile>\r
@@ -2364,6 +2361,9 @@
     <ClCompile Include="..\..\src\load\old\item-loader-savefile10.cpp">\r
       <Filter>load\old</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\load\old\monster-loader-savefile10.cpp">\r
+      <Filter>load\old</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
@@ -4070,12 +4070,6 @@
     <ClInclude Include="..\..\src\load\load-util.h">\r
       <Filter>load</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\savedata-flag-types.h">\r
-      <Filter>load</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\load\monster-loader.h">\r
-      <Filter>load</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\load\load-zangband.h">\r
       <Filter>load</Filter>\r
     </ClInclude>\r
@@ -5121,6 +5115,15 @@
     <ClInclude Include="..\..\src\load\old\item-loader-savefile10.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
+    <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
+      <Filter>load\old</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\load\old\savedata10-monster-flag-types.h">\r
+      <Filter>load\old</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 47a6b52..aa017bd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -343,7 +343,6 @@ hengband_SOURCES = \
        load/floor-loader.cpp load/floor-loader.h \
        load/info-loader.cpp load/info-loader.h \
        load/inventory-loader.cpp load/inventory-loader.h \
-       load/monster-loader.cpp load/monster-loader.h \
        load/old-feature-types.h \
        load/load-util.cpp load/load-util.h \
        load/load-zangband.cpp load/load-zangband.h \
@@ -362,6 +361,7 @@ hengband_SOURCES = \
        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-loader-savefile10.cpp load/old/monster-loader-savefile10.h \
        \
        locale/english.cpp locale/english.h \
        locale/japanese.cpp locale/japanese.h \

diff --git a/src/load/dummy-loader.cpp b/src/load/dummy-loader.cpp
index fd2526d..8ca51f9 100644 (file)
--- a/src/load/dummy-loader.cpp
+++ b/src/load/dummy-loader.cpp
@@ -1,7 +1,7 @@
 #include "load/dummy-loader.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
-#include "load/monster-loader.h"
+#include "load/old/monster-loader-savefile10.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/load/floor-loader.cpp b/src/load/floor-loader.cpp
index 6d518f9..398418f 100644 (file)
--- a/src/load/floor-loader.cpp
+++ b/src/load/floor-loader.cpp
@@ -9,10 +9,10 @@
 #include "io/uid-checker.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
-#include "load/monster-loader.h"
 #include "load/old-feature-types.h"
 #include "load/old/item-loader-savefile10.h"
 #include "load/old/load-v1-5-0.h"
+#include "load/old/monster-loader-savefile10.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"

diff --git a/src/load/old/item-loader-savefile10.cpp b/src/load/old/item-loader-savefile10.cpp
index efb043b..c184a80 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/savedata-flag-types.h"
+#include "load/old/savedata10-item-flag-types.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/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 6e3b0f7..09e0d73 100644 (file)
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -14,9 +14,9 @@
 #include "grid/trap.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
-#include "load/monster-loader.h"
 #include "load/old-feature-types.h"
 #include "load/old/item-loader-savefile10.h"
+#include "load/old/monster-loader-savefile10.h"
 #include "mind/mind-weaponsmith.h"
 #include "monster-floor/monster-move.h"
 #include "monster-race/monster-race.h"

diff --git a/src/load/monster-loader.cpp b/src/load/old/monster-loader-savefile10.cpp
similarity index 97%
rename from src/load/monster-loader.cpp
rename to src/load/old/monster-loader-savefile10.cpp
index c0b1d0a..d57a0bc 100644 (file)
--- a/src/load/monster-loader.cpp
+++ b/src/load/old/monster-loader-savefile10.cpp
@@ -1,8 +1,8 @@
-#include "load/monster-loader.h"
+#include "load/old/monster-loader-savefile10.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
-#include "load/savedata-flag-types.h"
+#include "load/old/savedata10-monster-flag-types.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"

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

diff --git a/src/load/savedata-flag-types.h b/src/load/old/savedata10-item-flag-types.h
similarity index 65%
rename from src/load/savedata-flag-types.h
rename to src/load/old/savedata10-item-flag-types.h
index c0b05c3..4a11514 100644 (file)
--- a/src/load/savedata-flag-types.h
+++ b/src/load/old/savedata10-item-flag-types.h
@@ -32,22 +32,3 @@ enum class SaveDataItemFlagType {
        ART_FLAGS = 0x10000000,
        STACK_IDX = 0x20000000,
 };
-
-enum class SaveDataMonsterFlagType {
-       AP_R_IDX = 0x00000001,
-       SUB_ALIGN = 0x00000002,
-       CSLEEP = 0x00000004,
-       FAST = 0x00000008,
-       SLOW = 0x00000010,
-       STUNNED = 0x00000020,
-       CONFUSED = 0x00000040,
-       MONFEAR = 0x00000080,
-       TARGET_Y = 0x00000100,
-       TARGET_X = 0x00000200,
-       INVULNER = 0x00000400,
-       SMART = 0x00000800,
-       EXP = 0x00001000,
-       MFLAG2 = 0x00002000,
-       NICKNAME = 0x00004000,
-       PARENT = 0x00008000,
-};

diff --git a/src/load/old/savedata10-monster-flag-types.h b/src/load/old/savedata10-monster-flag-types.h
new file mode 100644 (file)
index 0000000..d464e9f
--- /dev/null
+++ b/src/load/old/savedata10-monster-flag-types.h
@@ -0,0 +1,20 @@
+#pragma once
+
+enum class SaveDataMonsterFlagType {
+    AP_R_IDX = 0x00000001,
+    SUB_ALIGN = 0x00000002,
+    CSLEEP = 0x00000004,
+    FAST = 0x00000008,
+    SLOW = 0x00000010,
+    STUNNED = 0x00000020,
+    CONFUSED = 0x00000040,
+    MONFEAR = 0x00000080,
+    TARGET_Y = 0x00000100,
+    TARGET_X = 0x00000200,
+    INVULNER = 0x00000400,
+    SMART = 0x00000800,
+    EXP = 0x00001000,
+    MFLAG2 = 0x00002000,
+    NICKNAME = 0x00004000,
+    PARENT = 0x00008000,
+};

diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index bd30a3c..174f5d9 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/savedata-flag-types.h"
+#include "load/old/savedata10-item-flag-types.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 25436f6..747777a 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/savedata-flag-types.h"
+#include "load/old/savedata10-monster-flag-types.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"