[Refactor] #40236 Renamed store.c/h to market/store.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index d248302..c93aff8 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -338,7 +338,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\store.c" />\r
+    <ClCompile Include="..\..\src\market\store.c" />\r
     <ClCompile Include="..\..\src\floor-streams.c" />\r
     <ClCompile Include="..\..\src\targeting.c" />\r
     <ClCompile Include="..\..\src\gameterm.c" />\r
@@ -531,7 +531,7 @@
     <ClInclude Include="..\..\src\floor-streams.h" />\r
     <ClInclude Include="..\..\src\spells-world.h" />\r
     <ClInclude Include="..\..\src\spells.h" />\r
-    <ClInclude Include="..\..\src\store.h" />\r
+    <ClInclude Include="..\..\src\market\store.h" />\r
     <ClInclude Include="..\..\src\targeting.h" />\r
     <ClInclude Include="..\..\src\gameterm.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index d56e01f..26c4913 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -208,9 +208,6 @@
     <ClCompile Include="..\..\src\grid.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\store.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\rumor.c">
       <Filter>market</Filter>
     </ClCompile>
@@ -586,6 +583,9 @@
     <ClCompile Include="..\..\src\market\building.c">
       <Filter>market</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\market\store.c">
+      <Filter>market</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -773,9 +773,6 @@
     <ClInclude Include="..\..\src\grid.h">
       <Filter>floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\store.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\rumor.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -1154,6 +1151,9 @@
     <ClInclude Include="..\..\src\market\building.h">
       <Filter>market</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\market\store.h">
+      <Filter>market</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 4dc9cb7..3fddadf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,7 @@ hengband_SOURCES = \
        avatar.h avatar.c birth.c birth.h \
        \
        market/arena-info-table.c market/arena-info-table.h \
+       market/building.c market/building.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 \
@@ -21,7 +22,8 @@ hengband_SOURCES = \
        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 \
-       store.c store.h building.c building.h chest.c chest.h chuukei.c chuukei.h \
+       market/store.c market/store.h \
+       chest.c chest.h chuukei.c chuukei.h \
        \
        view/display-characteristic.c view/display-characteristic.h \
        view/display-fruit.c view/display-fruit.h \

diff --git a/src/autopick.c b/src/autopick.c
index 455d8f6..10e56ed 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -22,7 +22,7 @@
 
 #include "mind.h"
 
-#include "store.h"
+#include "market/store.h"
 #include "player-status.h"
 #include "player-move.h"
 #include "player-class.h"

diff --git a/src/birth.c b/src/birth.c
index ba2044e..cab8c02 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -28,7 +28,7 @@
 #include "history.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
-#include "store.h"
+#include "market/store.h"
 #include "patron.h"
 #include "quest.h"
 #include "player/process-name.h"

diff --git a/src/character-dump.c b/src/character-dump.c
index 7c621f1..eed5bb1 100644 (file)
--- a/src/character-dump.c
+++ b/src/character-dump.c
@@ -3,7 +3,7 @@
 #include "world.h"
 #include "floor-town.h"
 #include "dungeon.h"
-#include "store.h"
+#include "market/store.h"
 #include "cmd/cmd-pet.h"
 #include "monster-status.h"
 #include "sort.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index f813b04..98fadd0 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -53,7 +53,7 @@
 #include "sort.h"
 #include "mutation.h"
 #include "quest.h"
-#include "store.h"
+#include "market/store.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "object-flavor.h"

diff --git a/src/core.c b/src/core.c
index 346aa81..580340a 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -55,7 +55,7 @@
 #include "object-ego.h"
 #include "object-curse.h"
 #include "object-flavor.h"
-#include "store.h"
+#include "market/store.h"
 #include "spells.h"
 #include "spells-summon.h"
 #include "spells-object.h"

diff --git a/src/init.c b/src/init.c
index 8c096fe..0735e06 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -44,7 +44,7 @@
 #include "quest.h"
 #include "trap.h"
 #include "rooms.h"
-#include "store.h"
+#include "market/store.h"
 #include "wild.h"
 #include "dungeon-file.h"
 #include "files.h"

diff --git a/src/load.c b/src/load.c
index 41eb860..c6c7c4d 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -56,7 +56,7 @@
 #include "monster.h"
 #include "market/store-util.h"
 #include "quest.h"
-#include "store.h"
+#include "market/store.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "spells-status.h"

diff --git a/src/store.c b/src/market/store.c
similarity index 99%
rename from src/store.c
rename to src/market/store.c
index 625f4e3..909d68e 100644 (file)
--- a/src/store.c
+++ b/src/market/store.c
@@ -35,7 +35,7 @@
 #include "cmd/cmd-zapwand.h"
 #include "cmd/cmd-magiceat.h"
 #include "spells.h"
-#include "store.h"
+#include "market/store.h"
 #include "avatar.h"
 #include "cmd-spell.h"
 #include "rumor.h"

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

diff --git a/src/player/process-death.c b/src/player/process-death.c
index db54645..4090f6f 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -12,7 +12,7 @@
 #include "player-inventory.h"
 #include "object-flavor.h"
 #include "market/store-util.h"
-#include "store.h"
+#include "market/store.h"
 #include "gameterm.h"
 
 #define GRAVE_LINE_WIDTH 31

diff --git a/src/rooms-city.c b/src/rooms-city.c
index 9712950..21e2b58 100644 (file)
--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -6,7 +6,7 @@
 #include "floor-generate.h"
 #include "rooms.h"
 #include "rooms-city.h"
-#include "store.h"
+#include "market/store.h"
 #include "wild.h"
 #include "market/store-util.h"
 

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 8711512..d6c0a27 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -5,7 +5,7 @@
 #include "floor-generate.h"
 #include "grid.h"
 #include "rooms.h"
-#include "store.h"
+#include "market/store.h"
 #include "trap.h"
 #include "monster.h"
 #include "feature.h"

diff --git a/src/save.c b/src/save.c
index 0c99a59..dc355f5 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -22,7 +22,7 @@
 #include "sort.h"
 #include "dungeon.h"
 #include "quest.h"
-#include "store.h"
+#include "market/store.h"
 #include "market/store-util.h"
 #include "wild.h"
 #include "floor.h"

diff --git a/src/wizard1.c b/src/wizard1.c
index 8c3bff4..3ba49e8 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -17,7 +17,7 @@
 #include "core.h"
 #include "artifact.h"
 #include "sort.h"
-#include "store.h"
+#include "market/store.h"
 #include "market/store-util.h"
 #include "monster.h"
 #include "object-flavor.h"