[Refactor] #38862 Moved playeer-inventory.c/h to inventory/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index ea42a1e..e4c9ba6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -327,7 +327,7 @@
     <ClCompile Include="..\..\src\player\player-class.c" />\r
     <ClCompile Include="..\..\src\player\player-damage.c" />\r
     <ClCompile Include="..\..\src\player\player-effects.c" />\r
-    <ClCompile Include="..\..\src\player-inventory.c" />\r
+    <ClCompile Include="..\..\src\inventory\player-inventory.c" />\r
     <ClCompile Include="..\..\src\player\player-personality.c" />\r
     <ClCompile Include="..\..\src\player\player-race.c" />\r
     <ClCompile Include="..\..\src\player\player-sex.c" />\r
@@ -590,7 +590,7 @@
     <ClInclude Include="..\..\src\mutation\mutation-processor.h" />\r
     <ClInclude Include="..\..\src\object\object-flavor.h" />\r
     <ClInclude Include="..\..\src\object\lite-processor.h" />\r
-    <ClInclude Include="..\..\src\player-inventory.h" />\r
+    <ClInclude Include="..\..\src\inventory\player-inventory.h" />\r
     <ClInclude Include="..\..\src\player\mimic-info-table.h" />\r
     <ClInclude Include="..\..\src\player\permanent-resistances.h" />\r
     <ClInclude Include="..\..\src\player\process-name.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index f6a4108..55d8f3d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -757,9 +757,6 @@
     <ClCompile Include="..\..\src\monster\monster-status.c">
       <Filter>monster</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player-inventory.c">
-      <Filter>inventory</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\system\system-variables.c">
       <Filter>system</Filter>
     </ClCompile>
@@ -829,6 +826,9 @@
     <ClCompile Include="..\..\src\monster\horror-descriptions.c">
       <Filter>monster</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\inventory\player-inventory.c">
+      <Filter>inventory</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1620,9 +1620,6 @@
     <ClInclude Include="..\..\src\monster\monster-status.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player-inventory.h">
-      <Filter>inventory</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\system\angband.h">
       <Filter>system</Filter>
     </ClInclude>
@@ -1701,6 +1698,9 @@
     <ClInclude Include="..\..\src\monster\horror-descriptions.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\inventory\player-inventory.h">
+      <Filter>inventory</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c025d0..a4f1f4c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -160,6 +160,7 @@ hengband_SOURCES = \
        inventory/inventory-curse.c inventory/inventory-curse.h \
        inventory/recharge-processor.c inventory/recharge-processor.h \
        inventory/pack-overflow.c inventory/pack-overflow.h \
+       inventory/player-inventory.c inventory/player-inventory.h \
        \
        patron.h patron.c \
        \
@@ -168,7 +169,7 @@ hengband_SOURCES = \
        player/player-status.c player/player-status.h player/player-effects.c player/player-effects.h \
        player/player-skill.c player/player-skill.h player/player-class.c player/player-class.h \
        player/player-race.c player/player-race.h player/player-personality.c player/player-personality.h \
-       player/player-sex.c player/player-sex.h player/player-inventory.c player/player-inventory.h \
+       player/player-sex.c player/player-sex.h \
        \
        quest.h quest.c\
        \

diff --git a/src/autopick/autopick-entry.c b/src/autopick/autopick-entry.c
index 315c8e3..9237149 100644 (file)
--- a/src/autopick/autopick-entry.c
+++ b/src/autopick/autopick-entry.c
@@ -9,7 +9,7 @@
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 #ifdef JP
 static char kanji_colon[] = "：";

diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c
index 8e0c4e0..4808241 100644 (file)
--- a/src/autopick/autopick-finder.c
+++ b/src/autopick/autopick-finder.c
@@ -12,7 +12,7 @@
 #include "autopick/autopick-matcher.h"
 #include "object/object-flavor.h"
 #include "gameterm.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
  /*
   * @brief \97^\82¦\82ç\82ê\82½\83A\83C\83e\83\80\82ª\8e©\93®\8fE\82¢\82Ì\83\8a\83X\83g\82É\93o\98^\82³\82ê\82Ä\82¢\82é\82©\82Ç\82¤\82©\82ð\8c\9f\8dõ\82·\82é

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index b9825fb..35824a9 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -23,7 +23,7 @@
 #include "player/player-effects.h"
 #include "realm/realm-hex.h"
 #include "player/player-damage.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "monster/monster-status.h"
 #include "files.h"
 #include "object/object-kind.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 350bf45..215b9ca 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -37,7 +37,7 @@
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-personality.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-broken.h"
 #include "object/object-flavor.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index cdd67ca..b98827c 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -21,7 +21,7 @@
 #include "player/player-damage.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index a39524a..5e074cc 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -18,7 +18,7 @@
 #include "monster/monsterrace-hook.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "spell/technic-info-table.h"
 
 #include "cmd-basic.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 78c18f7..cde87df 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -48,7 +48,7 @@
 #include "snipe.h"
 #include "player/player-race.h"
 #include "view/display-main-window.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 /*!
  * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display inventory_list

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index a4f5052..6724212 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -22,7 +22,7 @@
 #include "player/player-status.h"
 #include "player/player-damage.h"
 #include "player/mimic-info-table.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "realm/realm-hex.h"
 #include "spell/spells-floor.h"
 #include "object/object-broken.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index bf1bebe..ce48bad 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -18,7 +18,7 @@
 #include "player/player-damage.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "rumor.h"
 #include "realm/realm-hex.h"
 

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 0d176fa..feed853 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -11,7 +11,7 @@
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "view/display-main-window.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 
 

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index ed2d0d8..94edff8 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -27,7 +27,7 @@
 #include "player/player-effects.h"
 #include "player/player-skill.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index d8988d1..6e3b05b 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -8,7 +8,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spell/spells-status.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 105b39a..51805ad 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -6,7 +6,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "spell/spells-type.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 5478ea3..7da96b8 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -8,7 +8,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"

diff --git a/src/player-inventory.c b/src/inventory/player-inventory.c
similarity index 99%
rename from src/player-inventory.c
rename to src/inventory/player-inventory.c
index df46029..83d0694 100644 (file)
--- a/src/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 #include "gameterm.h"
 #include "object/object.h"

diff --git a/src/player-inventory.h b/src/inventory/player-inventory.h
similarity index 100%
rename from src/player-inventory.h
rename to src/inventory/player-inventory.h

diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c
index 6543208..b3c45b5 100644 (file)
--- a/src/inventory/simple-appraiser.c
+++ b/src/inventory/simple-appraiser.c
@@ -5,7 +5,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "player/player-move.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "autopick/autopick.h"
 
 /*!

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 7ab87d4..917773e 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -15,7 +15,7 @@
 #include "market/store-util.h"
 #include "main/sound-definitions-table.h"
 #include "io/write-diary.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "player/player-effects.h"
 #include "market/store.h" // do_cmd_store() がある。後で移設する.
 #include "quest.h" // do_cmd_quest() がある。後で移設する.

diff --git a/src/market/building.c b/src/market/building.c
index 3cb3122..4bf151f 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -56,7 +56,7 @@
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "scores.h"
 #include "shoot.h"
 #include "view/display-main-window.h"

diff --git a/src/market/store.c b/src/market/store.c
index 845ba4d..90a9a62 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -45,7 +45,7 @@
 #include "rumor.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "floor/floor-events.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index ea8373b..8f6c5f1 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -25,7 +25,7 @@
 #include "object/object-hook.h"
 #include "player/player-move.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "monster/monster.h"
 #include "files.h"
 #include "gameterm.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 912ca3d..9672401 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -159,7 +159,7 @@
 #include "player/player-effects.h"
 #include "player/player-race.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "player/player-personality.h"
 #include "spell/spells-floor.h"
 #include "grid/feature.h"

diff --git a/src/player/process-death.c b/src/player/process-death.c
index 696e4bb..a07d90e 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -9,7 +9,7 @@
 #include "process-death.h"
 #include "world/world.h"
 #include "floor/floor-town.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-flavor.h"
 #include "market/store-util.h"
 #include "market/store.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index f3c7279..e8ae1ea 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -29,7 +29,7 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "realm/realm-hex.h"
 #include "grid/grid.h"
 #include "monster/monsterrace.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index c736622..61b3601 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -17,7 +17,7 @@
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "targeting.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 4e5ef92..9bbf1ae 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -2,7 +2,7 @@
 #include "util.h"
 
 #include "spell/spells-summon.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "monster/monster-status.h"
 #include "floor/floor.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 92ab1d4..5a7fa77 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -50,7 +50,7 @@
 #include "player/player-skill.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 #include "dungeon/dungeon.h"
 #include "floor/floor-events.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 207a5ad..141cfdf 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -32,7 +32,7 @@
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "spell/spells-summon.h"
 #include "quest.h"
 #include "object/artifact.h"

diff --git a/src/targeting.c b/src/targeting.c
index 18f95eb..5b37556 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -31,7 +31,7 @@
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "floor/floor-town.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "monster/monster-status.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index bc08944..9bfe8df 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -31,7 +31,7 @@
 #include "player/player-race.h"
 #include "player/mimic-info-table.h"
 #include "player/player-effects.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 #include "monster/monster.h"
 #include "view/display-main-window.h"
 

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index aec930a..f4ea15d 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -34,7 +34,7 @@
 #include "player/player-effects.h"
 #include "player/player-skill.h"
 #include "player/player-class.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
 
 #include "spell/spells-util.h"
 #include "spell/spells-object.h"