[Refactor] #40399 Separated old-ego-extra-values.h from object.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 783a008..bffabe6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -501,6 +501,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-util.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick.h" />\r
     <ClInclude Include="..\..\src\object\death-scythe.h" />\r
+    <ClInclude Include="..\..\src\object\old-ego-extra-values.h" />\r
     <ClInclude Include="..\..\src\object\tr-types.h" />\r
     <ClInclude Include="..\..\src\object\tval-types.h" />\r
     <ClInclude Include="..\..\src\player\avatar.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index c07e2f2..04155f8 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2146,6 +2146,9 @@
     <ClInclude Include="..\..\src\object\tval-types.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\old-ego-extra-values.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ae498db..4819078 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -205,6 +205,7 @@ hengband_SOURCES = \
        object/warning.c object/warning.h \
        object/death-scythe.c object/death-scythe.h \
        object/tr-types.h object/tval-type.h \
+       object/old-ego-extra-values.h \
        \
        inventory/simple-appraiser.c inventory/simple-appraiser.h \
        inventory/inventory-curse.c inventory/inventory-curse.h \

diff --git a/src/io/load.c b/src/io/load.c
index 243bb6c..d54c257 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -89,6 +89,7 @@
 #include "player/player-races-table.h"
 #include "market/bounty.h"
 #include "object/tr-types.h"
+#include "object/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
 
  /*
   * Maximum number of tries for selection of a proper quest monster

diff --git a/src/object/object.h b/src/object/object.h
index 0cb3d7f..5ff4ce2 100644 (file)
--- a/src/object/object.h
+++ b/src/object/object.h
@@ -58,14 +58,6 @@ struct object_type
 
        ARTIFACT_IDX name1;             /* Artifact type, if any */
        EGO_IDX name2;                  /* Ego-Item type, if any */
-
-
-       /*
-        * 変愚ver1.5.0以前に使われていたアイテムの追加特性フラグ / Hack -- special "xtra" object powers
-        */
-#define EGO_XTRA_SUSTAIN        1 /*!< 旧版アイテムフラグ(非推奨): 追加維持能力 / Sustain one stat */
-#define EGO_XTRA_POWER          2 /*!< 旧版アイテムフラグ(非推奨): 追加上級耐性 / High resist */
-#define EGO_XTRA_ABILITY        3 /*!< 旧版アイテムフラグ(非推奨): 追加能力 / Special ability */
        XTRA8 xtra1;                    /* Extra info type (now unused) */
 
        XTRA8 xtra2;                    /* Extra info activation index */

diff --git a/src/object/old-ego-extra-values.h b/src/object/old-ego-extra-values.h
new file mode 100644 (file)
index 0000000..536680e
--- /dev/null
+++ b/src/object/old-ego-extra-values.h
@@ -0,0 +1,12 @@
+/*
+ * @brief 変愚ver1.5.0以前に使われていたアイテムの追加特性フラグ / Hack -- special "xtra" object powers
+ * @date 2020/05/28
+ * @author Hourier
+ * @details いずれ消したい
+ */
+
+#pragma once
+
+#define EGO_XTRA_SUSTAIN 1 /*!< 旧版アイテムフラグ(非推奨): 追加維持能力 / Sustain one stat */
+#define EGO_XTRA_POWER 2 /*!< 旧版アイテムフラグ(非推奨): 追加上級耐性 / High resist */
+#define EGO_XTRA_ABILITY 3 /*!< 旧版アイテムフラグ(非推奨): 追加能力 / Special ability */