[Change]アイテムとモンスターのロードクラスを当分同じクラスに

ver50まで

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index ab2fdaa..35c463e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -497,13 +497,13 @@
     <ClCompile Include="..\..\src\load\dungeon-loader.cpp" />\r
     <ClCompile Include="..\..\src\load\extra-loader.cpp" />\r
     <ClCompile Include="..\..\src\load\inventory-loader.cpp" />\r
-    <ClCompile Include="..\..\src\load\old\item-loader-savefile10.cpp" />\r
+    <ClCompile Include="..\..\src\load\old\item-loader-savefile50.cpp" />\r
     <ClCompile Include="..\..\src\load\load-util.cpp" />\r
     <ClCompile Include="..\..\src\load\old\load-v1-5-0.cpp" />\r
     <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\old\monster-loader-savefile10.cpp" />\r
+    <ClCompile Include="..\..\src\load\old\monster-loader-savefile50.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
@@ -931,7 +931,7 @@
     <ClInclude Include="..\..\src\load\monster\monster-loader-base.h" />\r
     <ClInclude Include="..\..\src\load\monster\monster-loader-factory.h" />\r
     <ClInclude Include="..\..\src\load\monster\monster-loader-version-types.h" />\r
-    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile10.h" />\r
+    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile50.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
@@ -1250,18 +1250,18 @@
     <ClInclude Include="..\..\src\load\dungeon-loader.h" />\r
     <ClInclude Include="..\..\src\load\extra-loader.h" />\r
     <ClInclude Include="..\..\src\load\inventory-loader.h" />\r
-    <ClInclude Include="..\..\src\load\old\item-loader-savefile10.h" />\r
+    <ClInclude Include="..\..\src\load\old\item-loader-savefile50.h" />\r
     <ClInclude Include="..\..\src\load\load-util.h" />\r
     <ClInclude Include="..\..\src\load\old\load-v1-7-0.h" />\r
     <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\old\monster-loader-savefile10.h" />\r
+    <ClInclude Include="..\..\src\load\old\monster-loader-savefile50.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\old\item-flag-types-savefile10.h" />\r
+    <ClInclude Include="..\..\src\load\old\item-flag-types-savefile50.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 66205f4..e521b1f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2358,10 +2358,10 @@
     <ClCompile Include="..\..\src\load\old\load-v1-7-0.cpp">\r
       <Filter>load\old</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\load\old\item-loader-savefile10.cpp">\r
+    <ClCompile Include="..\..\src\load\old\item-loader-savefile50.cpp">\r
       <Filter>load\old</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\load\old\monster-loader-savefile10.cpp">\r
+    <ClCompile Include="..\..\src\load\old\monster-loader-savefile50.cpp">\r
       <Filter>load\old</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\load\item\item-loader-base.cpp">\r
@@ -5115,16 +5115,16 @@
     <ClInclude Include="..\..\src\load\old\load-v1-7-0.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\item-loader-savefile10.h">\r
+    <ClInclude Include="..\..\src\load\old\item-loader-savefile50.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\monster-loader-savefile10.h">\r
+    <ClInclude Include="..\..\src\load\old\monster-loader-savefile50.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\item-flag-types-savefile10.h">\r
+    <ClInclude Include="..\..\src\load\old\item-flag-types-savefile50.h">\r
       <Filter>load\old</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile10.h">\r
+    <ClInclude Include="..\..\src\load\old\monster-flag-types-savefile50.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 2be1387..324e1bd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -365,12 +365,12 @@ hengband_SOURCES = \
        load/monster/monster-loader-factory.cpp load/monster/monster-loader-factory.h \
        load/monster/monster-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/item-flag-types-savefile50.h \
+       load/old/item-loader-savefile50.cpp load/old/item-loader-savefile50.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 \
+       load/old/monster-flag-types-savefile50.h \
+       load/old/monster-loader-savefile50.cpp load/old/monster-loader-savefile50.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 122a082..df9ea29 100644 (file)
--- a/src/load/dummy-loader.cpp
+++ b/src/load/dummy-loader.cpp
@@ -2,7 +2,7 @@
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/monster/monster-loader-factory.h"
-#include "load/old/monster-loader-savefile10.h"
+#include "load/old/monster-loader-savefile50.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 0fceb44..9411be8 100644 (file)
--- a/src/load/floor-loader.cpp
+++ b/src/load/floor-loader.cpp
@@ -1,4 +1,4 @@
-#include "load/floor-loader.h"
+#include "load/floor-loader.h"
 #include "floor/floor-generator.h"
 #include "floor/floor-object.h"
 #include "floor/floor-save-util.h"
@@ -12,9 +12,9 @@
 #include "load/load-util.h"
 #include "load/old-feature-types.h"
 #include "load/monster/monster-loader-factory.h"
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 #include "load/old/load-v1-5-0.h"
-#include "load/old/monster-loader-savefile10.h"
+#include "load/old/monster-loader-savefile50.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"

diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp
index 99af52f..6154190 100644 (file)
--- a/src/load/inventory-loader.cpp
+++ b/src/load/inventory-loader.cpp
@@ -2,7 +2,7 @@
 #include "inventory/inventory-slot-types.h"
 #include "load/item/item-loader-factory.h"
 #include "load/load-util.h"
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 #include "object/object-mark-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/load/item/item-loader-factory.cpp b/src/load/item/item-loader-factory.cpp
index 6c9fd29..e7039d2 100644 (file)
--- a/src/load/item/item-loader-factory.cpp
+++ b/src/load/item/item-loader-factory.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @brief アイテム情報をセーブデータから読み込むクラスを選択するファクトリクラス
  * @date 2021/10/16
  * @author Hourier
@@ -8,7 +8,7 @@
 #include "load/item/item-loader-base.h"
 #include "load/item/item-loader-version-types.h"
 #include "load/load-util.h"
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 
 /*!
  * @brief アイテム読み込みクラスを返却する.
@@ -20,9 +20,9 @@ std::shared_ptr<ItemLoaderBase> ItemLoaderFactory::create_loader()
 {
     auto version = get_version();
     switch (version) {
-    case ItemLoaderVersionType::LOAD10:
-        return std::make_shared<ItemLoader10>();
-    case ItemLoaderVersionType::LOAD11:
+    case ItemLoaderVersionType::LOAD50:
+        return std::make_shared<ItemLoader50>();
+    case ItemLoaderVersionType::LOAD51:
         // dummy yet.
     default:
         throw("Invalid loader version was specified!");
@@ -44,9 +44,9 @@ std::shared_ptr<ItemLoaderBase> ItemLoaderFactory::create_loader()
  */
 ItemLoaderVersionType ItemLoaderFactory::get_version()
 {
-    if (loading_savefile_version_is_older_than(11)) {
-        return ItemLoaderVersionType::LOAD10;
+    if (loading_savefile_version_is_older_than(51)) {
+        return ItemLoaderVersionType::LOAD50;
     } else {
-        return ItemLoaderVersionType::LOAD11;
+        return ItemLoaderVersionType::LOAD51;
     }
 }

diff --git a/src/load/item/item-loader-version-types.h b/src/load/item/item-loader-version-types.h
index 8ff76ef..f0e98e6 100644 (file)
--- a/src/load/item/item-loader-version-types.h
+++ b/src/load/item/item-loader-version-types.h
@@ -1,6 +1,6 @@
 #pragma once
 
 enum class ItemLoaderVersionType {
-       LOAD10,
-       LOAD11,
+    LOAD50,
+    LOAD51,
 };

diff --git a/src/load/load.cpp b/src/load/load.cpp
index 4606ce3..e5d5b89 100644 (file)
--- a/src/load/load.cpp
+++ b/src/load/load.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @brief セーブファイル読み込み処理 / Purpose: support for loading savefiles -BEN-
  * @date 2014/07/07
  * @author
@@ -26,7 +26,7 @@
 #include "load/load-util.h"
 #include "load/load-zangband.h"
 #include "load/lore-loader.h"
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 #include "load/old/load-v1-5-0.h"
 #include "load/old/load-v1-7-0.h"
 #include "load/option-loader.h"

diff --git a/src/load/monster/monster-loader-factory.cpp b/src/load/monster/monster-loader-factory.cpp
index 8c11264..9919c27 100644 (file)
--- a/src/load/monster/monster-loader-factory.cpp
+++ b/src/load/monster/monster-loader-factory.cpp
@@ -4,11 +4,11 @@
  * @author Hourier
  */
 
-#include "load/monster/monster-loader-base.h"
 #include "load/monster/monster-loader-factory.h"
-#include "load/monster/monster-loader-version-types.h"
 #include "load/load-util.h"
-#include "load/old/monster-loader-savefile10.h"
+#include "load/monster/monster-loader-base.h"
+#include "load/monster/monster-loader-version-types.h"
+#include "load/old/monster-loader-savefile50.h"
 
 /*!
  * @brief アイテム読み込みクラスを返却する.
@@ -20,9 +20,9 @@ std::shared_ptr<MonsterLoaderBase> MonsterLoaderFactory::create_loader(PlayerTyp
 {
     auto version = get_version();
     switch (version) {
-    case MonsterLoaderVersionType::LOAD10:
-        return std::make_shared<MonsterLoader10>(player_ptr);
-    case MonsterLoaderVersionType::LOAD11:
+    case MonsterLoaderVersionType::LOAD50:
+        return std::make_shared<MonsterLoader50>(player_ptr);
+    case MonsterLoaderVersionType::LOAD51:
         // dummy yet.
     default:
         throw("Invalid loader version was specified!");
@@ -33,7 +33,7 @@ std::shared_ptr<MonsterLoaderBase> MonsterLoaderFactory::create_loader(PlayerTyp
  * @brief MonsterLoaderのバージョン切り替え.
  * @return セーブファイルバージョン群の中で互換性のある最古のバージョン.
  * @details (備忘録)例えばバージョン15で更に変更された場合、以下のように書き換えること.
- * 
+ *
  * if (loading_savefile_version_is_older_than(15)) {
  *   return MonsterLoaderVersionType::LOAD11;
  * } else if (loading_savefile_version_is_older_than(11)) {
@@ -44,9 +44,9 @@ std::shared_ptr<MonsterLoaderBase> MonsterLoaderFactory::create_loader(PlayerTyp
  */
 MonsterLoaderVersionType MonsterLoaderFactory::get_version()
 {
-    if (loading_savefile_version_is_older_than(11)) {
-        return MonsterLoaderVersionType::LOAD10;
+    if (loading_savefile_version_is_older_than(51)) {
+        return MonsterLoaderVersionType::LOAD50;
     } else {
-        return MonsterLoaderVersionType::LOAD11;
+        return MonsterLoaderVersionType::LOAD51;
     }
 }

diff --git a/src/load/monster/monster-loader-version-types.h b/src/load/monster/monster-loader-version-types.h
index c5097ce..afcd4bf 100644 (file)
--- a/src/load/monster/monster-loader-version-types.h
+++ b/src/load/monster/monster-loader-version-types.h
@@ -1,6 +1,6 @@
 #pragma once
 
 enum class MonsterLoaderVersionType {
-    LOAD10,
-    LOAD11,
+    LOAD50,
+    LOAD51,
 };

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

diff --git a/src/load/old/item-loader-savefile10.cpp b/src/load/old/item-loader-savefile50.cpp
similarity index 97%
rename from src/load/old/item-loader-savefile10.cpp
rename to src/load/old/item-loader-savefile50.cpp
index c62e37e..95cd157 100644 (file)
--- a/src/load/old/item-loader-savefile10.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -1,10 +1,10 @@
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 #include "artifact/fixed-art-types.h"
 #include "game-option/runtime-arguments.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
+#include "load/old/item-flag-types-savefile50.h"
 #include "load/old/load-v1-5-0.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"
@@ -19,10 +19,10 @@
 #include "util/quarks.h"
 
 /*!
- * @brief アイテムオブジェクトを読み込む(v3.0.0 Savefile ver10まで)
+ * @brief アイテムオブジェクトを読み込む(v3.0.0 Savefile ver50まで)
  * @param o_ptr アイテムオブジェクト保存先ポインタ
  */
-void ItemLoader10::rd_item(object_type *o_ptr)
+void ItemLoader50::rd_item(object_type *o_ptr)
 {
     if (h_older_than(1, 5, 0, 0)) {
         rd_item_old(o_ptr);

diff --git a/src/load/old/item-loader-savefile10.h b/src/load/old/item-loader-savefile50.h
similarity index 64%
rename from src/load/old/item-loader-savefile10.h
rename to src/load/old/item-loader-savefile50.h
index cb218c0..ec9b76d 100644 (file)
--- a/src/load/old/item-loader-savefile10.h
+++ b/src/load/old/item-loader-savefile50.h
@@ -3,8 +3,8 @@
 #include "load/item/item-loader-base.h"
 
 struct object_type;
-class ItemLoader10 : public ItemLoaderBase {
+class ItemLoader50 : public ItemLoaderBase {
 public:
-    ItemLoader10() = default;
+    ItemLoader50() = default;
     void rd_item(object_type *o_ptr) override;
 };

diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 7f31e6b..d4fd15f 100644 (file)
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -18,8 +18,8 @@
 #include "load/load-util.h"
 #include "load/monster/monster-loader-factory.h"
 #include "load/old-feature-types.h"
-#include "load/old/item-loader-savefile10.h"
-#include "load/old/monster-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
+#include "load/old/monster-loader-savefile50.h"
 #include "mind/mind-weaponsmith.h"
 #include "monster-floor/monster-move.h"
 #include "monster-race/monster-race.h"

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

diff --git a/src/load/old/monster-loader-savefile10.cpp b/src/load/old/monster-loader-savefile50.cpp
similarity index 93%
rename from src/load/old/monster-loader-savefile10.cpp
rename to src/load/old/monster-loader-savefile50.cpp
index df86891..15a7704 100644 (file)
--- a/src/load/old/monster-loader-savefile10.cpp
+++ b/src/load/old/monster-loader-savefile50.cpp
@@ -1,23 +1,23 @@
-#include "load/old/monster-loader-savefile10.h"
+#include "load/old/monster-loader-savefile50.h"
 #include "load/angband-version-comparer.h"
 #include "load/load-util.h"
 #include "load/old/load-v1-5-0.h"
-#include "load/old/monster-flag-types-savefile10.h"
+#include "load/old/monster-flag-types-savefile50.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "util/enum-converter.h"
 #include "util/quarks.h"
 
-MonsterLoader10::MonsterLoader10(PlayerType *player_ptr)
+MonsterLoader50::MonsterLoader50(PlayerType *player_ptr)
     : player_ptr(player_ptr)
 {
 }
 
 /*!
- * @brief モンスターを読み込む(v3.0.0 Savefile ver10まで)
+ * @brief モンスターを読み込む(v3.0.0 Savefile ver50まで)
  */
-void MonsterLoader10::rd_monster(monster_type *m_ptr_)
+void MonsterLoader50::rd_monster(monster_type *m_ptr_)
 {
     this->m_ptr = m_ptr_;
     if (h_older_than(1, 5, 0, 0)) {

diff --git a/src/load/old/monster-loader-savefile10.h b/src/load/old/monster-loader-savefile50.h
similarity index 71%
rename from src/load/old/monster-loader-savefile10.h
rename to src/load/old/monster-loader-savefile50.h
index bda3e33..8de6199 100644 (file)
--- a/src/load/old/monster-loader-savefile10.h
+++ b/src/load/old/monster-loader-savefile50.h
@@ -4,9 +4,9 @@
 
 struct monster_type;
 class PlayerType;
-class MonsterLoader10 : public MonsterLoaderBase {
+class MonsterLoader50 : public MonsterLoaderBase {
 public:
-    MonsterLoader10(PlayerType *player_ptr);
+    MonsterLoader50(PlayerType *player_ptr);
     void rd_monster(monster_type *m_ptr) override;
 
 private:

diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index 57f7144..c01e18f 100644 (file)
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -4,7 +4,7 @@
 #include "load/angband-version-comparer.h"
 #include "load/item/item-loader-factory.h"
 #include "load/load-util.h"
-#include "load/old/item-loader-savefile10.h"
+#include "load/old/item-loader-savefile50.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "store/store.h"

diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index 6ce0c9e..4ed6e94 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/item-flag-types-savefile10.h"
+#include "load/old/item-flag-types-savefile50.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 ad110a2..7c3d6a0 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/monster-flag-types-savefile10.h"
+#include "load/old/monster-flag-types-savefile50.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"