[Refactor] #40399 Moves specific kinds of items such as torches from object/ to speci...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 99bc63a..48f29d7 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -217,7 +217,7 @@
     <ClCompile Include="..\..\src\object-enchant\apply-magic-others.c" />\r
     <ClCompile Include="..\..\src\object-enchant\apply-magic-weapon.c" />\r
     <ClCompile Include="..\..\src\object-enchant\apply-magic.c" />\r
-    <ClCompile Include="..\..\src\object\bow.c" />\r
+    <ClCompile Include="..\..\src\specific-object\bow.c" />\r
     <ClCompile Include="..\..\src\object\object-stack.c" />\r
     <ClCompile Include="..\..\src\object\object-value-calc.c" />\r
     <ClCompile Include="..\..\src\perception\object-perception.c" />\r
@@ -246,8 +246,8 @@
     <ClCompile Include="..\..\src\autopick\autopick-registry.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-util.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick.c" />\r
-    <ClCompile Include="..\..\src\object\death-scythe.c" />\r
-    <ClCompile Include="..\..\src\object\torch.c" />\r
+    <ClCompile Include="..\..\src\specific-object\death-scythe.c" />\r
+    <ClCompile Include="..\..\src\specific-object\torch.c" />\r
     <ClCompile Include="..\..\src\pet\pet-util.c" />\r
     <ClCompile Include="..\..\src\player\avatar.c" />\r
     <ClCompile Include="..\..\src\birth\character-builder.c" />\r
@@ -309,7 +309,7 @@
     <ClCompile Include="..\..\src\main\sound-definitions-table.c" />\r
     <ClCompile Include="..\..\src\cmd-building\cmd-building.c" />\r
     <ClCompile Include="..\..\src\io-dump\character-dump.c" />\r
-    <ClCompile Include="..\..\src\object\chest.c" />\r
+    <ClCompile Include="..\..\src\specific-object\chest.c" />\r
     <ClCompile Include="..\..\src\io\chuukei.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-activate.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-basic.c" />\r
@@ -513,7 +513,7 @@
     <ClInclude Include="..\..\src\object-enchant\apply-magic-others.h" />\r
     <ClInclude Include="..\..\src\object-enchant\apply-magic-weapon.h" />\r
     <ClInclude Include="..\..\src\object-enchant\apply-magic.h" />\r
-    <ClInclude Include="..\..\src\object\bow.h" />\r
+    <ClInclude Include="..\..\src\specific-object\bow.h" />\r
     <ClInclude Include="..\..\src\object\object-stack.h" />\r
     <ClInclude Include="..\..\src\object\object-value-calc.h" />\r
     <ClInclude Include="..\..\src\perception\object-perception.h" />\r
@@ -551,7 +551,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-registry.h" />\r
     <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\specific-object\death-scythe.h" />\r
     <ClInclude Include="..\..\src\object-enchant\item-apply-magic.h" />\r
     <ClInclude Include="..\..\src\object-enchant\item-feeling.h" />\r
     <ClInclude Include="..\..\src\object\item-use-flags.h" />\r
@@ -579,7 +579,7 @@
     <ClInclude Include="..\..\src\sv-definition\sv-staff-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-wand-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-weapon-types.h" />\r
-    <ClInclude Include="..\..\src\object\torch.h" />\r
+    <ClInclude Include="..\..\src\specific-object\torch.h" />\r
     <ClInclude Include="..\..\src\object-enchant\tr-types.h" />\r
     <ClInclude Include="..\..\src\object-enchant\trc-types.h" />\r
     <ClInclude Include="..\..\src\object\tval-types.h" />\r
@@ -660,7 +660,7 @@
     <ClInclude Include="..\..\src\main\sound-definitions-table.h" />\r
     <ClInclude Include="..\..\src\cmd-building\cmd-building.h" />\r
     <ClInclude Include="..\..\src\io-dump\character-dump.h" />\r
-    <ClInclude Include="..\..\src\object\chest.h" />\r
+    <ClInclude Include="..\..\src\specific-object\chest.h" />\r
     <ClInclude Include="..\..\src\io\chuukei.h" />\r
     <ClCompile Include="..\..\src\player\player-move.c" />\r
     <ClCompile Include="..\..\src\io\files-util.c" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 915d82c..dcf32e0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1112,16 +1112,16 @@
     <ClCompile Include="..\..\src\mind\racial-cavalry.c">
       <Filter>mind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\object\bow.c">
+    <ClCompile Include="..\..\src\specific-object\bow.c">
       <Filter>specific-object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\object\chest.c">
+    <ClCompile Include="..\..\src\specific-object\chest.c">
       <Filter>specific-object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\object\torch.c">
+    <ClCompile Include="..\..\src\specific-object\death-scythe.c">
       <Filter>specific-object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\object\death-scythe.c">
+    <ClCompile Include="..\..\src\specific-object\torch.c">
       <Filter>specific-object</Filter>
     </ClCompile>
   </ItemGroup>
@@ -2392,16 +2392,16 @@
     <ClInclude Include="..\..\src\mind\racial-cavalry.h">
       <Filter>mind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\bow.h">
+    <ClInclude Include="..\..\src\specific-object\bow.h">
       <Filter>specific-object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\chest.h">
+    <ClInclude Include="..\..\src\specific-object\chest.h">
       <Filter>specific-object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\torch.h">
+    <ClInclude Include="..\..\src\specific-object\death-scythe.h">
       <Filter>specific-object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\object\death-scythe.h">
+    <ClInclude Include="..\..\src\specific-object\torch.h">
       <Filter>specific-object</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c85d3d..bdf81d9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,9 +292,6 @@ hengband_SOURCES = \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
        \
-       object/bow.c object/bow.h \
-       object/chest.c object/chest.h \
-       object/death-scythe.c object/death-scythe.h \
        object/object1.c object/object1.h \
        object/object-broken.c object/object-broken.h \
        object/object-flavor.c object/object-flavor.h \
@@ -306,7 +303,6 @@ hengband_SOURCES = \
        object/object-value.c object/object-value.h \
        object/object-value-calc.c object/object-value-calc.h \
        object/lite-processor.c object/lite-processor.h \
-       object/torch.c object/torch.h \
        object/tval-types.h \
        object/warning.c object/warning.h \
        object/object-mark-types.h \
@@ -380,6 +376,11 @@ hengband_SOURCES = \
        room/rooms-pit-nest.c room/rooms-pit-nest.h \
        room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
        \
+       specific-object/bow.c specific-object/bow.h \
+       specific-object/chest.c specific-object/chest.h \
+       specific-object/death-scythe.c specific-object/death-scythe.h \
+       specific-object/torch.c specific-object/torch.h \
+       \
        spell/technic-info-table.c spell/technic-info-table.h \
        spell/spells-describer.c spell/spells-describer.h \
        spell/spells-execution.c spell/spells-execution.h \

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index fb8d44b..5cfc5d7 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -36,7 +36,7 @@
 #include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
 #include "object-enchant/artifact.h"
-#include "object/chest.h"
+#include "specific-object/chest.h"
 #include "object/item-use-flags.h"
 #include "perception/object-perception.h"
 #include "object/object-broken.h"
@@ -47,7 +47,7 @@
 #include "object/object-stack.h"
 #include "object-enchant/special-object-flags.h"
 #include "sv-definition/sv-bow-types.h"
-#include "object/torch.h"
+#include "specific-object/torch.h"
 #include "object-enchant/tr-types.h"
 #include "player/avatar.h"
 #include "player/player-effects.h"

diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index 8efcd57..fe1b1d1 100644 (file)
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -1,6 +1,6 @@
 #include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
-#include "object/death-scythe.h"
+#include "specific-object/death-scythe.h"
 #include "sv-definition/sv-weapon-types.h"
 
 /*!

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index 043b672..3b864a9 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -3,7 +3,7 @@
 #include "object-enchant/artifact.h"
 #include "object-enchant/tr-types.h"
 #include "object/object1.h"
-#include "object/torch.h"
+#include "specific-object/torch.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell/spells-hex.h"
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 4d40844..e497c46 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -27,7 +27,7 @@
 #include "monster/monster.h"
 #include "mutation/mutation.h"
 #include "object-enchant/artifact.h"
-#include "object/bow.h"
+#include "specific-object/bow.h"
 #include "perception/object-perception.h"
 #include "object-enchant/object-ego.h"
 #include "object/object-hook.h"

diff --git a/src/specific-object/bow.c b/src/specific-object/bow.c
index 8cba7be..ad19e0e 100644 (file)
--- a/src/specific-object/bow.c
+++ b/src/specific-object/bow.c
@@ -1,4 +1,4 @@
-#include "object/bow.h"
+#include "specific-object/bow.h"
 #include "sv-definition/sv-bow-types.h"
 
 /*!

diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c
index c6d4b19..d90f99a 100644 (file)
--- a/src/specific-object/chest.c
+++ b/src/specific-object/chest.c
@@ -1,4 +1,4 @@
-#include "object/chest.h"
+#include "specific-object/chest.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "grid/grid.h"

diff --git a/src/specific-object/death-scythe.c b/src/specific-object/death-scythe.c
index a68b636..d9bf9d3 100644 (file)
--- a/src/specific-object/death-scythe.c
+++ b/src/specific-object/death-scythe.c
@@ -5,15 +5,13 @@
  * @details 現時点ではダメージ反射のみ。行数に注意して関数を追加しても良い.
  */
 
-#include "system/angband.h"
-#include "combat/player-attack-util.h"
-#include "object/death-scythe.h"
-#include "main/sound-definitions-table.h"
-#include "player/player-damage.h"
-#include "core/stuff-handler.h"
+#include "specific-object/death-scythe.h"
 #include "combat/attack-criticality.h"
-#include "object/object1.h"
+#include "core/stuff-handler.h"
+#include "main/sound-definitions-table.h"
 #include "object-enchant/tr-types.h"
+#include "object/object1.h"
+#include "player/player-damage.h"
 
 /*!
  * @brief 死の大鎌ダメージが跳ね返ってきた時の、種族ごとのダメージ倍率を返す

diff --git a/src/specific-object/death-scythe.h b/src/specific-object/death-scythe.h
index f11b007..d8ad0b0 100644 (file)
--- a/src/specific-object/death-scythe.h
+++ b/src/specific-object/death-scythe.h
@@ -1,3 +1,6 @@
 #pragma once
 
+#include "system/angband.h"
+#include "combat/player-attack-util.h"
+
 void process_death_scythe_reflection(player_type *attacker_ptr, player_attack_type *pa_ptr);

diff --git a/src/specific-object/torch.c b/src/specific-object/torch.c
index ca74e22..c68c2f7 100644 (file)
--- a/src/specific-object/torch.c
+++ b/src/specific-object/torch.c
@@ -1,4 +1,4 @@
-#include "object/torch.h"
+#include "specific-object/torch.h"
 #include "sv-definition/sv-lite-types.h"
 #include "object-enchant/tr-types.h"