[Refactor] #40399 Renamed object1.c/h to object-info.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 9d427e0..21c7659 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -765,7 +765,7 @@
     <ClCompile Include="..\..\src\mspell\mspells3.c" />\r
     <ClCompile Include="..\..\src\mspell\assign-monster-spell.c" />\r
     <ClCompile Include="..\..\src\mutation\mutation.c" />\r
-    <ClCompile Include="..\..\src\object\object1.c" />\r
+    <ClCompile Include="..\..\src\object\object-info.c" />\r
     <ClCompile Include="..\..\src\mind\racial.c" />\r
     <ClCompile Include="..\..\src\term\readdib.c" />\r
     <ClCompile Include="..\..\src\realm\realm-arcane.c" />\r
@@ -977,7 +977,7 @@
     <ClInclude Include="..\..\src\object-enchant\object-ego.h" />\r
     <ClInclude Include="..\..\src\object\object-hook.h" />\r
     <ClInclude Include="..\..\src\object\object-broken.h" />\r
-    <ClInclude Include="..\..\src\object\object1.h" />\r
+    <ClInclude Include="..\..\src\object\object-info.h" />\r
     <ClInclude Include="..\..\src\object\object-kind-hook.h" />\r
     <ClInclude Include="..\..\src\object\object-kind.h" />\r
     <ClInclude Include="..\..\src\player\patron.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index ac121bc..0aa83fa 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -443,9 +443,6 @@
     <ClCompile Include="..\..\src\floor\floor-town.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\object\object1.c">
-      <Filter>object</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\object\object-broken.c">
       <Filter>object</Filter>
     </ClCompile>
@@ -1241,6 +1238,9 @@
     <ClCompile Include="..\..\src\object\object-flags.c">
       <Filter>object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object\object-info.c">
+      <Filter>object</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2149,9 +2149,6 @@
     <ClInclude Include="..\..\src\object\object-util.h">
       <Filter>object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\object1.h">
-      <Filter>object</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\object\item-use-flags.h">
       <Filter>object</Filter>
     </ClInclude>
@@ -2671,6 +2668,9 @@
     <ClInclude Include="..\..\src\object\object-flags.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\object-info.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 554f871..a6fc421 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -323,12 +323,12 @@ hengband_SOURCES = \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
        \
-       object/object1.c object/object1.h \
        object/object-broken.c object/object-broken.h \
        object/object-flags.c object/object-flags.h \
        object/object-flavor.c object/object-flavor.h \
        object/object-generator.c object/object-generator.h \
        object/object-hook.c object/object-hook.h \
+       object/object-info.c object/object-info.h \
        object/object-kind.c object/object-kind.h \
        object/object-kind-hook.c object/object-kind-hook.h \
        object/object-stack.c object/object-stack.h \

diff --git a/src/autopick/autopick-entry.c b/src/autopick/autopick-entry.c
index fcdbcea..4afa3ab 100644 (file)
--- a/src/autopick/autopick-entry.c
+++ b/src/autopick/autopick-entry.c
@@ -11,7 +11,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 
 #ifdef JP

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
index 6340dc3..1427cf8 100644 (file)
--- a/src/autopick/autopick-matcher.c
+++ b/src/autopick/autopick-matcher.c
@@ -14,7 +14,7 @@
 #include "object/object-kind.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "object-enchant/special-object-flags.h"
 
 /*

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index ce0f565..54e3706 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -20,7 +20,7 @@
 #include "inventory/inventory-object.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/player-move.h"
 #include "util/util.h"
 

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index d1f783d..1824422 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -11,7 +11,7 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 #include "sv-definition/sv-bow-types.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 634dac7..1182ea5 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -25,7 +25,7 @@
 #include "object/object-flags.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h" // 相互参照している。このファイルが長いのでobject-infoの方へ引っ越しを検討.
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 27141ae..273b8f9 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -17,7 +17,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 83a72c5..88b5a79 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -43,7 +43,7 @@
 #include "object/object-mark-types.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"

diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index 124ff8f..176f46b 100644 (file)
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -18,7 +18,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "sv-definition/sv-potion-types.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 80915ae..bc38f70 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -19,7 +19,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 1724972..4b7fd25 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -10,7 +10,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-staff-types.h"
 #include "player/avatar.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 147cbd8..c4e4ec0 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -8,7 +8,7 @@
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 462c117..07c5438 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -9,7 +9,7 @@
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-class.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index a518d67..6cca225 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -48,7 +48,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-stack.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-effects.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 16e072d..1478cdf 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -21,7 +21,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-table.h"

diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index 0e3d80c..08df649 100644 (file)
--- a/src/floor/fixed-map-generator.c
+++ b/src/floor/fixed-map-generator.c
@@ -16,7 +16,7 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "room/rooms-vault.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "system/system-variables.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 19ecf77..dc7b2ee 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -17,7 +17,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-stack.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "object-enchant/special-object-flags.h"
 #include "system/system-variables.h"
 #include "view/object-describer.h"

diff --git a/src/inventory/inventory-damage.c b/src/inventory/inventory-damage.c
index 322c9ab..451bc0e 100644 (file)
--- a/src/inventory/inventory-damage.c
+++ b/src/inventory/inventory-damage.c
@@ -7,7 +7,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-stack.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 
 /*!
  * @brief アイテムを指定確率で破損させる /

diff --git a/src/inventory/inventory-object.c b/src/inventory/inventory-object.c
index a8f9e8e..6b390e7 100644 (file)
--- a/src/inventory/inventory-object.c
+++ b/src/inventory/inventory-object.c
@@ -6,7 +6,7 @@
 #include "object/object-mark-types.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/player-effects.h" // 暫定、相互参照している.
 #include "util/object-sort.h"
 #include "view/object-describer.h"

diff --git a/src/inventory/pack-overflow.c b/src/inventory/pack-overflow.c
index 4180281..c439d9a 100644 (file)
--- a/src/inventory/pack-overflow.c
+++ b/src/inventory/pack-overflow.c
@@ -4,7 +4,7 @@
 #include "floor/floor-object.h"
 #include "inventory/inventory-object.h"
 #include "object/object-flavor.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/player-move.h"
 
 /*!

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index f655c18..730774e 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -8,7 +8,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "sv-definition/sv-other-types.h"
 #include "player/player-move.h"
 #include "term/gameterm.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 037963d..495a34e 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -14,7 +14,7 @@
 #include "market/arena-info-table.h"
 #include "monster/monster-status.h"
 #include "object/object-flavor.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"
 #include "player/race-info-table.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index 9df172c..191d3ef 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -12,7 +12,7 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "sv-definition/sv-other-types.h"

diff --git a/src/monster-attack/monster-eating.c b/src/monster-attack/monster-eating.c
index 12e56ed..762dd14 100644 (file)
--- a/src/monster-attack/monster-eating.c
+++ b/src/monster-attack/monster-eating.c
@@ -12,7 +12,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-effects.h"

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 739fc87..cd51c8f 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -23,7 +23,7 @@
 #include "object-enchant/trg-types.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "object/object-flags.h"
 #include "player/player-class.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 8fd9155..587af77 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -17,7 +17,7 @@
 #include "object-enchant/trg-types.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"

diff --git a/src/object/object1.c b/src/object/object-info.c
similarity index 98%
rename from src/object/object1.c
rename to src/object/object-info.c
index a6a4f13..8934cdd 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object-info.c
@@ -10,9 +10,9 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "art-definition/art-weapon-types.h"
-#include "cmd-item/cmd-activate.h"
+#include "cmd-item/cmd-activate.h" // 相互参照している。cmd-activateからここへ引っ越しを検討.
 #include "floor/floor.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/object-ego.h"

diff --git a/src/object/object1.h b/src/object/object-info.h
similarity index 100%
rename from src/object/object1.h
rename to src/object/object-info.h

diff --git a/src/perception/identification.c b/src/perception/identification.c
index 968a9bf..d4aafcd 100644 (file)
--- a/src/perception/identification.c
+++ b/src/perception/identification.c
@@ -8,7 +8,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-ring-types.h"

diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c
index a7b93ce..5f2cc2b 100644 (file)
--- a/src/perception/simple-perception.c
+++ b/src/perception/simple-perception.c
@@ -10,7 +10,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-move.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 47ebe6c..c11d637 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -164,7 +164,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "object/warning.h"
 #include "perception/object-perception.h"
 #include "player/player-class.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 36ca519..0e2ac98 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -35,7 +35,7 @@
 #include "object/object-flags.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 855cdc6..edf9b6e 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -42,7 +42,7 @@
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"
 #include "object/item-use-flags.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "object-enchant/object-boost.h"

diff --git a/src/store/store.c b/src/store/store.c
index 4efe89d..70b0ce2 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -51,7 +51,7 @@
 #include "object/object-kind.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "player/avatar.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 00e99b6..5ab2a2c 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -34,7 +34,7 @@
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index 810da2f..3d4012f 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -12,7 +12,7 @@
 #include "floor/floor.h"
 #include "knowledge/knowledge-mutations.h"
 #include "object/object-kind.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "player/mimic-info-table.h"
 #include "player/patron.h"
 #include "player/player-personality.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 95e5b98..0ad5322 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -27,7 +27,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object/object1.h"
+#include "object/object-info.h"
 #include "perception/object-perception.h"
 #include "store/store-util.h"
 #include "store/store.h"