[Refactor] #40275 Moved store-related files from market/ to store/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index f2c831b..1ec68aa 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -331,15 +331,15 @@
     <ClCompile Include="..\..\src\io\write-diary.c" />\r
     <ClCompile Include="..\..\src\market\arena-info-table.c" />\r
     <ClCompile Include="..\..\src\market\articles-on-sale.c" />\r
-    <ClCompile Include="..\..\src\market\black-market.c" />\r
+    <ClCompile Include="..\..\src\store\black-market.c" />\r
     <ClCompile Include="..\..\src\market\building-util.c" />\r
     <ClCompile Include="..\..\src\market\gold-magnification-table.c" />\r
     <ClCompile Include="..\..\src\market\play-gamble.c" />\r
     <ClCompile Include="..\..\src\market\poker.c" />\r
-    <ClCompile Include="..\..\src\market\say-comments.c" />\r
-    <ClCompile Include="..\..\src\market\store-owner-comments.c" />\r
-    <ClCompile Include="..\..\src\market\store-owners.c" />\r
-    <ClCompile Include="..\..\src\market\store-util.c" />\r
+    <ClCompile Include="..\..\src\store\say-comments.c" />\r
+    <ClCompile Include="..\..\src\store\store-owner-comments.c" />\r
+    <ClCompile Include="..\..\src\store\store-owners.c" />\r
+    <ClCompile Include="..\..\src\store\store-util.c" />\r
     <ClCompile Include="..\..\src\monster\monster-dist-offsets.c" />\r
     <ClCompile Include="..\..\src\monster\monster-process.c" />\r
     <ClCompile Include="..\..\src\monster\monster-status.c" />\r
@@ -568,7 +568,7 @@
     <ClCompile Include="..\..\src\room\rooms-vault.c" />\r
     <ClCompile Include="..\..\src\room\rooms.c" />\r
     <ClCompile Include="..\..\src\room\pit-nest-kinds-table.c" />\r
-    <ClCompile Include="..\..\src\market\rumor.c" />\r
+    <ClCompile Include="..\..\src\store\rumor.c" />\r
     <ClCompile Include="..\..\src\io\save.c" />\r
     <ClCompile Include="..\..\src\core\scores.c" />\r
     <ClCompile Include="..\..\src\player\selfinfo.c" />\r
@@ -595,7 +595,7 @@
     <ClCompile Include="..\..\src\player\process-death.c" />\r
     <ClCompile Include="..\..\src\view\display-player-misc-info.c" />\r
     <ClCompile Include="..\..\src\view\status-first-page.c" />\r
-    <ClCompile Include="..\..\src\market\store.c" />\r
+    <ClCompile Include="..\..\src\store\store.c" />\r
     <ClCompile Include="..\..\src\floor\floor-streams.c" />\r
     <ClCompile Include="..\..\src\io\targeting.c" />\r
     <ClCompile Include="..\..\src\term\gameterm.c" />\r
@@ -659,15 +659,15 @@
     <ClInclude Include="..\..\src\io\write-diary.h" />\r
     <ClInclude Include="..\..\src\market\arena-info-table.h" />\r
     <ClInclude Include="..\..\src\market\articles-on-sale.h" />\r
-    <ClInclude Include="..\..\src\market\black-market.h" />\r
+    <ClInclude Include="..\..\src\store\black-market.h" />\r
     <ClInclude Include="..\..\src\market\building-util.h" />\r
     <ClInclude Include="..\..\src\market\gold-magnification-table.h" />\r
     <ClInclude Include="..\..\src\market\play-gamble.h" />\r
     <ClInclude Include="..\..\src\market\poker.h" />\r
-    <ClInclude Include="..\..\src\market\say-comments.h" />\r
-    <ClInclude Include="..\..\src\market\store-owner-comments.h" />\r
-    <ClInclude Include="..\..\src\market\store-owners.h" />\r
-    <ClInclude Include="..\..\src\market\store-util.h" />\r
+    <ClInclude Include="..\..\src\store\say-comments.h" />\r
+    <ClInclude Include="..\..\src\store\store-owner-comments.h" />\r
+    <ClInclude Include="..\..\src\store\store-owners.h" />\r
+    <ClInclude Include="..\..\src\store\store-util.h" />\r
     <ClInclude Include="..\..\src\monster\monster-dist-offsets.h" />\r
     <ClInclude Include="..\..\src\monster\monster-attack.h" />\r
     <ClInclude Include="..\..\src\monster\monster-direction.h" />\r
@@ -792,7 +792,7 @@
     <ClInclude Include="..\..\src\room\rooms-trap.h" />\r
     <ClInclude Include="..\..\src\room\rooms-vault.h" />\r
     <ClInclude Include="..\..\src\room\rooms.h" />\r
-    <ClInclude Include="..\..\src\market\umor.h" />\r
+    <ClInclude Include="..\..\src\store\rumor.h" />\r
     <ClInclude Include="..\..\src\io\save.h" />\r
     <ClInclude Include="..\..\src\core\scores.h" />\r
     <ClInclude Include="..\..\src\player\selfinfo.h" />\r
@@ -806,7 +806,7 @@
     <ClInclude Include="..\..\src\floor\floor-streams.h" />\r
     <ClInclude Include="..\..\src\spell\spells-world.h" />\r
     <ClInclude Include="..\..\src\spell\spells1.h" />\r
-    <ClInclude Include="..\..\src\market\store.h" />\r
+    <ClInclude Include="..\..\src\store\store.h" />\r
     <ClInclude Include="..\..\src\io\targeting.h" />\r
     <ClInclude Include="..\..\src\term\gameterm.h" />\r
     <ClInclude Include="..\..\src\grid\trap.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8b6dd45..cba1127 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -182,27 +182,12 @@
     <ClCompile Include="..\..\src\market\poker.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\store-owners.c">
-      <Filter>market</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\market\store-owner-comments.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\market\articles-on-sale.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\say-comments.c">
-      <Filter>market</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\market\store-util.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\market\gold-magnification-table.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\black-market.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\market\building-util.c">
       <Filter>market</Filter>
     </ClCompile>
@@ -224,9 +209,6 @@
     <ClCompile Include="..\..\src\cmd\cmd-inn.c">
       <Filter>cmd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\store.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\main\sound-definitions-table.c">
       <Filter>main</Filter>
     </ClCompile>
@@ -761,9 +743,6 @@
     <ClCompile Include="..\..\src\monster\monster-race.c">
       <Filter>monster</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\rumor.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\io\report.c">
       <Filter>io</Filter>
     </ClCompile>
@@ -968,6 +947,27 @@
     <ClCompile Include="..\..\src\cmd\cmd-building.c">
       <Filter>cmd</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\store\rumor.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\say-comments.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\store.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\store-owner-comments.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\store-owners.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\store-util.c">
+      <Filter>store</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\store\black-market.c">
+      <Filter>store</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -1153,27 +1153,12 @@
     <ClInclude Include="..\..\src\market\poker.h">
       <Filter>market</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\store-owners.h">
-      <Filter>market</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\market\store-owner-comments.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\market\articles-on-sale.h">
       <Filter>market</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\say-comments.h">
-      <Filter>market</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\market\store-util.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\market\gold-magnification-table.h">
       <Filter>market</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\black-market.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\market\building-util.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -1195,9 +1180,6 @@
     <ClInclude Include="..\..\src\cmd\cmd-inn.h">
       <Filter>cmd</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\store.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\main\sound-definitions-table.h">
       <Filter>main</Filter>
     </ClInclude>
@@ -1777,9 +1759,6 @@
     <ClInclude Include="..\..\src\monster\monster-race.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\umor.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\io\report.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -1999,6 +1978,27 @@
     <ClInclude Include="..\..\src\market\building-actions-table.h">
       <Filter>market</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\store\say-comments.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\store.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\store-owner-comments.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\store-owners.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\rumor.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\store-util.h">
+      <Filter>store</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\store\black-market.h">
+      <Filter>store</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -2092,6 +2092,9 @@
     <Filter Include="mspell">
       <UniqueIdentifier>{738b47ea-2ba6-49a3-9bf8-a833ef46e218}</UniqueIdentifier>
     </Filter>
+    <Filter Include="store">
+      <UniqueIdentifier>{be097f30-d18c-4e9a-a13f-eac4ee7a9d9a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 345c4a4..37db67e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,14 +60,9 @@ hengband_SOURCES = \
        market/arena-info-table.c market/arena-info-table.h \
        market/building-util.c market/building-util.h \
        market/play-gamble.c market/play-gamble.h \
-       market/poker.c market/poker.h market/store-owners.c market/store-owners.h \
-       market/store-owner-comments.c market/store-owner-comments.h \
+       market/poker.c market/poker.h \
        market/articles-on-sale.c market/articles-on-sale.h \
-       market/black-market.c market/black-market.h \
-       market/say-comments.c market/say-comments.h \
-       market/store-util.c market/store-util.h \
        market/gold-magnification-table.c market/gold-magnification-table.h \
-       market/store.c market/store.h market/rumor.c market/rumor.h \
        market/arena.c market/arena.h \
        market/bounty-prize-table.c market/bounty-prize-table.h \
        market/bounty.c market/bounty.h \
@@ -81,6 +76,14 @@ hengband_SOURCES = \
        market/building-enchanter.c market/building-enchanter.h \
        market/building-actions-table.h \
        \
+       store/store.c store/store.h \
+       store/black-market.c store/black-market.h \
+       store/rumor.c store/rumor.h \
+       store/say-comments.c store/say-comments.h \
+       store/store-util.c store/store-util.h \
+       store/store-owners.c store/store-owners.h \
+       store/store-owner-comments.c store/store-owner-comments.h \
+       \
        view/display-characteristic.c view/display-characteristic.h \
        view/display-fruit.c view/display-fruit.h \
        view/display-player-stat-info.c view/display-player-stat-info.h \

diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c
index 305edb9..1c3975e 100644 (file)
--- a/src/birth/character-builder.c
+++ b/src/birth/character-builder.c
@@ -18,7 +18,7 @@
 #include "birth/birth-explanations-table.h"
 #include "floor/floor-town.h"
 #include "io/write-diary.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "player/player-sex.h"
 #include "floor/wild.h"
 #include "world/world.h"

diff --git a/src/cmd/cmd-inn.c b/src/cmd/cmd-inn.c
index 631d1ca..7ea2cf2 100644 (file)
--- a/src/cmd/cmd-inn.c
+++ b/src/cmd/cmd-inn.c
@@ -5,7 +5,7 @@
 #include "world/world.h"
 #include "player/player-effects.h"
 #include "core/turn-compensator.h"
-#include "market/rumor.h"
+#include "store/rumor.h"
 #include "player/player-races-table.h"
 #include "market/building-actions-table.h"
 

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 31b1ae7..8094e04 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -19,7 +19,7 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "inventory/player-inventory.h"
-#include "market/rumor.h"
+#include "store/rumor.h"
 #include "realm/realm-hex.h"
 
 #include "spell/spells-object.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 01c80e9..7cda01a 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -30,8 +30,8 @@
 #include "io/write-diary.h"
 #include "market/arena-info-table.h"
 #include "market/bounty.h"
-#include "market/store-util.h"
-#include "market/store.h"
+#include "store/store-util.h"
+#include "store/store.h"
 #include "object/object-flavor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c
index b02998f..fd4e925 100644 (file)
--- a/src/core/turn-compensator.c
+++ b/src/core/turn-compensator.c
@@ -2,9 +2,9 @@
 #include "core/turn-compensator.h"
 #include "world/world.h"
 #include "floor/floor-town.h"
-#include "market/store-owners.h"
-#include "market/store-util.h"
-#include "market/store.h"
+#include "store/store-owners.h"
+#include "store/store-util.h"
+#include "store/store.h"
 #include "player/player-races-table.h"
 
 /*!

diff --git a/src/io/character-dump.c b/src/io/character-dump.c
index fe10562..3c0fe4f 100644 (file)
--- a/src/io/character-dump.c
+++ b/src/io/character-dump.c
@@ -3,7 +3,7 @@
 #include "world/world.h"
 #include "floor/floor-town.h"
 #include "dungeon/dungeon.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "cmd/cmd-pet.h"
 #include "monster/monster-status.h"
 #include "core/sort.h"
@@ -16,7 +16,7 @@
 #include "io/player-status-dump.h"
 #include "io/write-diary.h"
 #include "player/avatar.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "market/arena-info-table.h"
 #include "player/race-info-table.h"
 

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index f98a53b..4f1a580 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -12,12 +12,12 @@
 #include "dungeon/dungeon.h"
 #include "combat/snipe.h"
 #include "autopick/autopick-pref-processor.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "main/sound-definitions-table.h"
 #include "io/write-diary.h"
 #include "inventory/player-inventory.h"
 #include "player/player-effects.h"
-#include "market/store.h" // do_cmd_store() がある。後で移設する.
+#include "store/store.h" // do_cmd_store() がある。後で移設する.
 #include "dungeon/quest.h" // do_cmd_quest() がある。後で移設する.
 #include "floor/wild.h"
 #include "spell/spells-object.h"

diff --git a/src/io/load.c b/src/io/load.c
index 09ec420..df800b6 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -55,9 +55,9 @@
 #include "grid/trap.h"
 #include "mutation/mutation.h"
 #include "monster/monster.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "dungeon/quest.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "object/artifact.h"
 #include "player/avatar.h"
 #include "spell/spells-status.h"

diff --git a/src/io/save.c b/src/io/save.c
index 888f8b8..3aec27f 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -22,8 +22,8 @@
 #include "core/sort.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
-#include "market/store.h"
-#include "market/store-util.h"
+#include "store/store.h"
+#include "store/store-util.h"
 #include "floor/wild.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"

diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c
index a41e5d8..ab1fb83 100644 (file)
--- a/src/knowledge/knowledge-inventory.c
+++ b/src/knowledge/knowledge-inventory.c
@@ -9,7 +9,7 @@
 #include "cmd/dump-util.h"
 #include "core/show-file.h"
 #include "object/object-flavor.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "floor/floor-town.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index e15a543..d3641ac 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -11,7 +11,7 @@
 #include "core/show-file.h"
 #include "dungeon/dungeon-file.h"
 #include "world/world.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "floor/floor-town.h"
 #include "object/object-flavor.h"
 #include "birth/birth-explanations-table.h"

diff --git a/src/main/init.c b/src/main/init.c
index 9fc9c83..18ce693 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -45,7 +45,7 @@
 #include "dungeon/quest.h"
 #include "grid/trap.h"
 #include "room/rooms.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "floor/wild.h"
 #include "dungeon/dungeon-file.h"
 #include "io/files-util.h"
@@ -61,7 +61,7 @@
 #include "room/rooms-vault.h"
 #include "world/world.h"
 #include "market/articles-on-sale.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c
index 3636ecd..99c2c5a 100644 (file)
--- a/src/market/articles-on-sale.c
+++ b/src/market/articles-on-sale.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "store-owners.h"
+#include "store/store-owners.h"
 #include "articles-on-sale.h"
 
 /*!

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index ae74b18..dbe9c2e 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -2,8 +2,8 @@
 #include "mutation/mutation-processor.h"
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
-#include "market/store-util.h"
-#include "market/store-owners.h"
+#include "store/store-util.h"
+#include "store/store-owners.h"
 #include "player/player-damage.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
@@ -11,7 +11,7 @@
 #include "spell/spells3.h"
 #include "spell/spells-floor.h"
 #include "io/targeting.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "object/object-hook.h"
 #include "mutation/mutation.h"
 #include "realm/realm-hex.h"

diff --git a/src/player/process-death.c b/src/player/process-death.c
index cfec169..cdb8f63 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -11,8 +11,8 @@
 #include "floor/floor-town.h"
 #include "inventory/player-inventory.h"
 #include "object/object-flavor.h"
-#include "market/store-util.h"
-#include "market/store.h"
+#include "store/store-util.h"
+#include "store/store.h"
 #include "term/gameterm.h"
 #include "core/stuff-handler.h"
 

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index e8b54c5..fa7cefa 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -6,9 +6,9 @@
 #include "floor/floor-generate.h"
 #include "room/rooms.h"
 #include "room/rooms-city.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "floor/wild.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 
 /*
 * Precalculate buildings' location of underground arcade

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index a5e3423..2f791de 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -5,7 +5,7 @@
 #include "floor/floor-generate.h"
 #include "grid/grid.h"
 #include "room/rooms.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "grid/trap.h"
 #include "monster/monster.h"
 #include "grid/feature.h"
@@ -13,7 +13,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "floor/wild.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 
 /*
  * The vault generation arrays

diff --git a/src/market/black-market.c b/src/store/black-market.c
similarity index 92%
rename from src/market/black-market.c
rename to src/store/black-market.c
index c090ba3..6865288 100644 (file)
--- a/src/market/black-market.c
+++ b/src/store/black-market.c
@@ -1,9 +1,9 @@
 #include "system/angband.h"
 #include "floor/floor-town.h"
 #include "object/object-hook.h"
-#include "market/black-market.h"
-#include "market/store-owners.h"
-#include "market/store-util.h"
+#include "store/black-market.h"
+#include "store/store-owners.h"
+#include "store/store-util.h"
 
 /*!
  * @brief ブラックマーケット用の無価値品の排除判定 /

diff --git a/src/market/black-market.h b/src/store/black-market.h
similarity index 100%
rename from src/market/black-market.h
rename to src/store/black-market.h

diff --git a/src/market/rumor.c b/src/store/rumor.c
similarity index 99%
rename from src/market/rumor.c
rename to src/store/rumor.c
index 7291ed1..7efff7d 100644 (file)
--- a/src/market/rumor.c
+++ b/src/store/rumor.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "market/rumor.h"
+#include "store/rumor.h"
 #include "util/util.h"
 
 #include "io/tokenizer.h"

diff --git a/src/market/rumor.h b/src/store/rumor.h
similarity index 100%
rename from src/market/rumor.h
rename to src/store/rumor.h

diff --git a/src/market/say-comments.c b/src/store/say-comments.c
similarity index 97%
rename from src/market/say-comments.c
rename to src/store/say-comments.c
index 3fdeb33..780be10 100644 (file)
--- a/src/market/say-comments.c
+++ b/src/store/say-comments.c
@@ -1,10 +1,10 @@
 #include "system/angband.h"
-#include "say-comments.h"
+#include "store/say-comments.h"
 #include "main/sound-definitions-table.h"
-#include "market/store-owner-comments.h"
-#include "market/store-util.h"
+#include "store/store-owner-comments.h"
+#include "store/store-util.h"
 #include "player/avatar.h"
-#include "market/rumor.h"
+#include "store/rumor.h"
 
 #define RUMOR_CHANCE 8
 

diff --git a/src/market/say-comments.h b/src/store/say-comments.h
similarity index 100%
rename from src/market/say-comments.h
rename to src/store/say-comments.h

diff --git a/src/market/store-owner-comments.c b/src/store/store-owner-comments.c
similarity index 99%
rename from src/market/store-owner-comments.c
rename to src/store/store-owner-comments.c
index ebda3d8..a240ae5 100644 (file)
--- a/src/market/store-owner-comments.c
+++ b/src/store/store-owner-comments.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "store-owner-comments.h"
+#include "store/store-owner-comments.h"
 
 /*!
  * todo _() でまとめる

diff --git a/src/market/store-owner-comments.h b/src/store/store-owner-comments.h
similarity index 100%
rename from src/market/store-owner-comments.h
rename to src/store/store-owner-comments.h

diff --git a/src/market/store-owners.c b/src/store/store-owners.c
similarity index 99%
rename from src/market/store-owners.c
rename to src/store/store-owners.c
index 1b7a8d9..c766a6f 100644 (file)
--- a/src/market/store-owners.c
+++ b/src/store/store-owners.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "store-owners.h"
+#include "store/store-owners.h"
 #include "player/player-races-table.h"
 
 /*!

diff --git a/src/market/store-owners.h b/src/store/store-owners.h
similarity index 100%
rename from src/market/store-owners.h
rename to src/store/store-owners.h

diff --git a/src/market/store-util.c b/src/store/store-util.c
similarity index 99%
rename from src/market/store-util.c
rename to src/store/store-util.c
index e93912f..717ffd3 100644 (file)
--- a/src/market/store-util.c
+++ b/src/store/store-util.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "market/store-util.h"
+#include "store/store-util.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 

diff --git a/src/market/store-util.h b/src/store/store-util.h
similarity index 100%
rename from src/market/store-util.h
rename to src/store/store-util.h

diff --git a/src/market/store.c b/src/store/store.c
similarity index 99%
rename from src/market/store.c
rename to src/store/store.c
index 03127fe..f7b7d1c 100644 (file)
--- a/src/market/store.c
+++ b/src/store/store.c
@@ -11,12 +11,12 @@
  */
 
 #include "system/angband.h"
-#include "market/say-comments.h"
-#include "market/store-owners.h"
-#include "market/store-util.h"
+#include "store/say-comments.h"
+#include "store/store-owners.h"
+#include "store/store-util.h"
 #include "market/gold-magnification-table.h"
-#include "market/store-util.h"
-#include "market/black-market.h"
+#include "store/store-util.h"
+#include "store/black-market.h"
 #include "core/stuff-handler.h"
 #include "util/util.h"
 #include "main/music-definitions-table.h"
@@ -39,10 +39,10 @@
 #include "cmd/cmd-zapwand.h"
 #include "cmd/cmd-magiceat.h"
 #include "spell/spells3.h"
-#include "market/store.h"
+#include "store/store.h"
 #include "player/avatar.h"
 #include "cmd-spell.h"
-#include "market/rumor.h"
+#include "store/rumor.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"

diff --git a/src/market/store.h b/src/store/store.h
similarity index 96%
rename from src/market/store.h
rename to src/store/store.h
index 63ae83b..c8b258c 100644 (file)
--- a/src/market/store.h
+++ b/src/store/store.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "market/store-owners.h"
+#include "store/store-owners.h"
 
  /*
   * Store constants

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index fd04f6d..d3fdebc 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -18,8 +18,8 @@
 #include "system/angband-version.h"
 #include "object/artifact.h"
 #include "core/sort.h"
-#include "market/store.h"
-#include "market/store-util.h"
+#include "store/store.h"
+#include "store/store-util.h"
 #include "monster/monster.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 46c4f0c..b860388 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -2,8 +2,8 @@
 #include "world/world-turn-processor.h"
 #include "world/world.h"
 #include "dungeon/dungeon.h"
-#include "market/store.h"
-#include "market/store-util.h"
+#include "store/store.h"
+#include "store/store-util.h"
 #include "io/write-diary.h"
 #include "floor/floor-events.h"
 #include "core/hp-mp-regenerator.h"