[Refactor] #40275 Renamed building.c/h to cmd-building.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 6b1d51c..d35d18d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -261,7 +261,7 @@
     <ClCompile Include="..\..\src\knowledge\knowledge-uniques.c" />\r
     <ClCompile Include="..\..\src\main\music-definitions-table.c" />\r
     <ClCompile Include="..\..\src\main\sound-definitions-table.c" />\r
-    <ClCompile Include="..\..\src\market\building.c" />\r
+    <ClCompile Include="..\..\src\cmd\cmd-building.c" />\r
     <ClCompile Include="..\..\src\io\character-dump.c" />\r
     <ClCompile Include="..\..\src\object\chest.c" />\r
     <ClCompile Include="..\..\src\io\chuukei.c" />\r
@@ -528,7 +528,7 @@
     <ClInclude Include="..\..\src\knowledge\knowledge-uniques.h" />\r
     <ClInclude Include="..\..\src\main\music-definitions-table.h" />\r
     <ClInclude Include="..\..\src\main\sound-definitions-table.h" />\r
-    <ClInclude Include="..\..\src\market\building.h" />\r
+    <ClInclude Include="..\..\src\cmd\cmd-building.h" />\r
     <ClInclude Include="..\..\src\io\character-dump.h" />\r
     <ClInclude Include="..\..\src\object\chest.h" />\r
     <ClInclude Include="..\..\src\io\chuukei.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 07b671a..b1423b8 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -224,9 +224,6 @@
     <ClCompile Include="..\..\src\cmd\cmd-inn.c">
       <Filter>cmd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\market\building.c">
-      <Filter>market</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\market\store.c">
       <Filter>market</Filter>
     </ClCompile>
@@ -968,6 +965,9 @@
     <ClCompile Include="..\..\src\market\building-enchanter.c">
       <Filter>market</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd\cmd-building.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -1195,9 +1195,6 @@
     <ClInclude Include="..\..\src\cmd\cmd-inn.h">
       <Filter>cmd</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\market\building.h">
-      <Filter>market</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\market\store.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -1996,6 +1993,9 @@
     <ClInclude Include="..\..\src\market\building-enchanter.h">
       <Filter>market</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd\cmd-building.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index f6cc283..c4af349 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ hengband_SOURCES = \
        main/init.c main/init.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 \
@@ -307,6 +306,7 @@ hengband_SOURCES = \
        knowledge/knowledge-quests.c knowledge/knowledge-quests.h \
        \
        cmd/cmd-autopick.c cmd/cmd-autopick.c \
+       cmd/cmd-building.c cmd/cmd-building.h \
        cmd/dump-util.c cmd/dump-util.h cmd/feeling-table.c cmd/feeling-table.h \
        cmd/monster-group-table.c cmd/monster-group-table.h \
        cmd/diary-subtitle-table.c cmd/diary-subtitle-table.h \

diff --git a/src/market/building.c b/src/cmd/cmd-building.c
similarity index 99%
rename from src/market/building.c
rename to src/cmd/cmd-building.c
index 00ae14f..2f0d234 100644 (file)
--- a/src/market/building.c
+++ b/src/cmd/cmd-building.c
@@ -28,7 +28,7 @@
 #include "floor/wild.h"
 #include "world/world.h"
 #include "player/avatar.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "mutation/mutation.h"
 #include "cmd-spell.h"
 #include "spell/spells3.h"

diff --git a/src/market/building.h b/src/cmd/cmd-building.h
similarity index 98%
rename from src/market/building.h
rename to src/cmd/cmd-building.h
index ceae492..eb8e59d 100644 (file)
--- a/src/market/building.h
+++ b/src/cmd/cmd-building.h
@@ -116,4 +116,4 @@ typedef struct
        OBJECT_SUBTYPE_VALUE sval;  /*!< モンスター打倒後に得られるアイテムの小カテゴリID / sval of prize */
 } arena_type;
 
-extern void do_cmd_bldg(player_type *player_ptr);
+extern void do_cmd_building(player_type *player_ptr);

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 586a76c..d992198 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -48,7 +48,7 @@
 #include "player/player-race.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "world/world.h"
 #include "room/rooms-vault.h"
 #include "object/object-kind.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 38c4b37..4174fd8 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -99,7 +99,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 #include "system/system-variables.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 17c5cc3..e420ead 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "system/system-variables.h"
 #include "io/load.h"
 #include "util/util.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 7c23c8e..f98a53b 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -33,6 +33,7 @@
 
 #include "cmd/cmd-activate.h"
 #include "cmd/cmd-autopick.h"
+#include "cmd/cmd-building.h"
 #include "cmd/cmd-diary.h"
 #include "cmd/cmd-draw.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/io/save.c b/src/io/save.c
index fb7c669..888f8b8 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -34,7 +34,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "monster/monster-race.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "view/display-main-window.h"
 #include "birth/quick-start.h"
 

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 18d2530..21058f8 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -17,7 +17,7 @@
 #include "term/gameterm.h"
 #include "io/targeting.h"
 
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "cmd-pet.h"
 #include "dungeon/dungeon-file.h"
 #include "object/object-curse.h"

diff --git a/src/main/init.c b/src/main/init.c
index f13274b..9fc9c83 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -40,7 +40,7 @@
 #include "term/gameterm.h"
 
 #include "object/artifact.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "main/init.h"
 #include "dungeon/quest.h"
 #include "grid/trap.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index ab0aa96..5959cbb 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -17,7 +17,7 @@
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "cmd-pet.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-kind-hook.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 8da0d8c..50f1640 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -6,7 +6,7 @@
 #include "term/gameterm.h"
 
 #include "player/avatar.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "io/write-diary.h"
 #include "autopick/autopick-pref-processor.h"
 #include "cmd/cmd-process-screen.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index ef8fffd..fa99aa2 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -22,7 +22,7 @@
 #include "object/artifact.h"
 #include "cmd-dump.h"
 #include "floor/floor.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "birth/character-builder.h"
 #include "grid/grid.h"
 #include "mutation/mutation.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 65eef97..1c054dd 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -3,7 +3,7 @@
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
 
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "dungeon/quest.h"
 #include "player/player-move.h"
 #include "player/player-status.h"

diff --git a/src/player/player-status.h b/src/player/player-status.h
index 257862f..8854101 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "player/player-personalities-table.h"
 
 struct floor_type;

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 57eaad4..5afee7a 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -12,7 +12,7 @@
  */
 
 #include "system/angband.h"
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "core/stuff-handler.h"
 #include "term/gameterm.h"
 #include "util/util.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index bc82163..15d04a9 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -17,7 +17,7 @@
 #include "autopick/autopick-util.h"
 #include "term/gameterm.h"
 
-#include "market/building.h"
+#include "cmd/cmd-building.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "io/files-util.h"