[Refactor] #40457 Moved cmd-building.c/h and cmd-inn.c/h to cmd-building/ to prepare...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index a63fa25..8803636 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -298,7 +298,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\cmd\cmd-building.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\io\chuukei.c" />\r
@@ -311,7 +311,7 @@
     <ClCompile Include="..\..\src\cmd-io\cmd-gameoption.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-help.c" />\r
     <ClCompile Include="..\..\src\cmd-action\cmd-hissatsu.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-inn.c" />\r
+    <ClCompile Include="..\..\src\cmd-building\cmd-inn.c" />\r
     <ClCompile Include="..\..\src\knowledge\knowledge-inventory.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-item.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-macro.c" />\r
@@ -633,7 +633,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\cmd\cmd-building.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\io\chuukei.h" />\r
@@ -728,7 +728,7 @@
     <ClInclude Include="..\..\src\cmd-io\cmd-gameoption.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-help.h" />\r
     <ClInclude Include="..\..\src\cmd-action\cmd-hissatsu.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-inn.h" />\r
+    <ClInclude Include="..\..\src\cmd-building\cmd-inn.h" />\r
     <ClInclude Include="..\..\src\knowledge\knowledge-inventory.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-macro.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8088460..ff3f7b4 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -122,9 +122,6 @@
     <ClCompile Include="..\..\src\player\mimic-info-table.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-inn.c">
-      <Filter>cmd</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\main\sound-definitions-table.c">
       <Filter>main</Filter>
     </ClCompile>
@@ -827,9 +824,6 @@
     <ClCompile Include="..\..\src\market\building-enchanter.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-building.c">
-      <Filter>cmd</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\store\rumor.c">
       <Filter>store</Filter>
     </ClCompile>
@@ -1085,6 +1079,12 @@
     <ClCompile Include="..\..\src\object\bow.c">
       <Filter>object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd-building\cmd-building.c">
+      <Filter>cmd-building</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cmd-building\cmd-inn.c">
+      <Filter>cmd-building</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -1210,9 +1210,6 @@
     <ClInclude Include="..\..\src\player\mimic-info-table.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-inn.h">
-      <Filter>cmd</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\main\sound-definitions-table.h">
       <Filter>main</Filter>
     </ClInclude>
@@ -1972,9 +1969,6 @@
     <ClInclude Include="..\..\src\market\building-enchanter.h">
       <Filter>market</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-building.h">
-      <Filter>cmd</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\market\building-actions-table.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -2320,6 +2314,12 @@
     <ClInclude Include="..\..\src\object\bow.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd-building\cmd-building.h">
+      <Filter>cmd-building</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cmd-building\cmd-inn.h">
+      <Filter>cmd-building</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -2434,6 +2434,9 @@
     <Filter Include="io-dump">
       <UniqueIdentifier>{739c9774-e51a-46eb-87c1-cd7cd332e97c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cmd-building">
+      <UniqueIdentifier>{6982e0e0-d2db-422e-8e92-77b1276e4030}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index e0f2cf7..389af17 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,10 +46,8 @@ hengband_SOURCES = \
        birth/auto-roller.c birth/auto-roller.h \
        birth/birth-wizard.c birth/birth-wizard.h \
        \
-       cmd/cmd-building.c cmd/cmd-building.h \
        cmd/cmd-basic.c cmd/cmd-basic.h \
        cmd/cmd-draw.c cmd/cmd-draw.h \
-       cmd/cmd-inn.c cmd/cmd-inn.h \
        cmd/cmd-visuals.c cmd/cmd-visuals.h \
        \
        cmd-action/cmd-attack.c cmd-action/cmd-attack.h \
@@ -58,6 +56,9 @@ hengband_SOURCES = \
        cmd-action/cmd-pet.c cmd-action/cmd-pet.h \
        cmd-action/cmd-spell.c cmd-action/cmd-spell.h \
        \
+       cmd-building/cmd-building.c cmd-building/cmd-building.h \
+       cmd-building/cmd-inn.c cmd-building/cmd-inn.h \
+       \
        cmd-io/cmd-autopick.c cmd-io/cmd-autopick.h \
        cmd-io/cmd-diary.c cmd-io/cmd-diary.h \
        cmd-io/cmd-dump.c cmd-io/cmd-dump.h \

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 7a577ba..54f6dfb 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -4,54 +4,54 @@
  * @author
  * Created by Ken Wigle for Kangband - a variant of Angband 2.8.3
  * -KMW-
- * 
+ *
  * Rewritten for Kangband 2.8.3i using Kamband's version of
  * building.c as written by Ivan Tkatchev
- * 
+ *
  * Changed for ZAngband by Robert Ruehlmann
-*/
+ */
 
 #include "system/angband.h"
-#include "util/util.h"
-#include "main/music-definitions-table.h"
-#include "core/stuff-handler.h"
+#include "cmd-building/cmd-building.h"
+#include "cmd-action/cmd-spell.h"
+#include "cmd-io/cmd-dump.h"
+#include "cmd-building/cmd-inn.h"
+#include "core/scores.h"
 #include "core/show-file.h"
 #include "core/special-internal-keys.h"
-#include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-inn.h"
-#include "floor/floor.h"
+#include "core/stuff-handler.h"
 #include "floor/floor-events.h"
 #include "floor/floor-save.h"
-#include "object/object-flavor.h"
-#include "object/object-hook.h"
-#include "monster/monster.h"
+#include "floor/floor.h"
 #include "floor/wild.h"
-#include "world/world.h"
-#include "player/avatar.h"
-#include "cmd/cmd-building.h"
-#include "mutation/mutation.h"
-#include "cmd-action/cmd-spell.h"
-#include "spell/spells3.h"
-#include "spell/spells-status.h"
 #include "io/files-util.h"
-#include "player/player-status.h"
-#include "player/player-personalities-table.h"
-#include "core/scores.h"
-#include "monster/monster-race.h"
-#include "market/poker.h"
-#include "market/building-util.h"
-#include "market/play-gamble.h"
+#include "main/music-definitions-table.h"
 #include "market/arena.h"
 #include "market/bounty.h"
-#include "market/building-recharger.h"
-#include "market/building-quest.h"
-#include "market/building-service.h"
-#include "market/building-craft-weapon.h"
+#include "market/building-actions-table.h"
 #include "market/building-craft-armor.h"
 #include "market/building-craft-fix.h"
-#include "market/building-monster.h"
+#include "market/building-craft-weapon.h"
 #include "market/building-enchanter.h"
-#include "market/building-actions-table.h"
+#include "market/building-monster.h"
+#include "market/building-quest.h"
+#include "market/building-recharger.h"
+#include "market/building-service.h"
+#include "market/building-util.h"
+#include "market/play-gamble.h"
+#include "market/poker.h"
+#include "monster/monster-race.h"
+#include "monster/monster.h"
+#include "mutation/mutation.h"
+#include "object/object-flavor.h"
+#include "object/object-hook.h"
+#include "player/avatar.h"
+#include "player/player-personalities-table.h"
+#include "player/player-status.h"
+#include "spell/spells-status.h"
+#include "spell/spells3.h"
+#include "util/util.h"
+#include "world/world.h"
 
 building_type building[MAX_BLDG];
 

diff --git a/src/cmd-building/cmd-inn.c b/src/cmd-building/cmd-inn.c
index 197f80c..ef619f2 100644 (file)
--- a/src/cmd-building/cmd-inn.c
+++ b/src/cmd-building/cmd-inn.c
@@ -1,13 +1,12 @@
-#include "system/angband.h"
-#include "cmd/cmd-inn.h"
+#include "cmd-building/cmd-inn.h"
 #include "cmd-item/cmd-magiceat.h"
+#include "core/turn-compensator.h"
 #include "io/write-diary.h"
-#include "world/world.h"
+#include "market/building-actions-table.h"
 #include "player/player-effects.h"
-#include "core/turn-compensator.h"
-#include "store/rumor.h"
 #include "player/player-races-table.h"
-#include "market/building-actions-table.h"
+#include "store/rumor.h"
+#include "world/world.h"
 
 /*!
  * @brief 宿屋で食事を摂る

diff --git a/src/cmd-building/cmd-inn.h b/src/cmd-building/cmd-inn.h
index bf756c2..ee989a9 100644 (file)
--- a/src/cmd-building/cmd-inn.h
+++ b/src/cmd-building/cmd-inn.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 bool inn_comm(player_type *customer_ptr, int cmd);

diff --git a/src/core/scores.c b/src/core/scores.c
index 80a0f84..4da8d41 100644 (file)
--- a/src/core/scores.c
+++ b/src/core/scores.c
@@ -10,28 +10,25 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "system/angband.h"
-#include "io/signal-handlers.h"
-#include "term/gameterm.h"
-#include "util/util.h"
+#include "core/scores.h"
+#include "cmd-io/cmd-dump.h"
 #include "core/turn-compensator.h"
-#include "system/angband-version.h"
-
 #include "dungeon/dungeon.h"
-#include "player/race-info-table.h"
-#include "player/player-status.h"
+#include "floor/floor.h"
+#include "io/report.h"
+#include "io/signal-handlers.h"
+#include "io/uid-checker.h"
+#include "io/write-diary.h"
+#include "locale/japanese.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
 #include "player/player-sex.h"
-#include "io/uid-checker.h"
-#include "io/files-util.h"
-#include "core/scores.h"
-#include "floor/floor.h"
+#include "player/player-status.h"
+#include "player/race-info-table.h"
+#include "system/angband-version.h"
+#include "term/gameterm.h"
+#include "util/util.h"
 #include "world/world.h"
-#include "io/write-diary.h"
-#include "cmd-io/cmd-dump.h"
-#include "io/report.h"
-#include "locale/japanese.h"
 
  /*
   * The "highscore" file descriptor, if available.

diff --git a/src/core/scores.h b/src/core/scores.h
index 5ac7b6f..92e1180 100644 (file)
--- a/src/core/scores.h
+++ b/src/core/scores.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "io/files-util.h"
+#include "system/angband.h"
+
 /*
  * Semi-Portable High Score List Entry (128 bytes) -- BEN
  *
@@ -36,14 +39,13 @@ typedef struct high_score
 
 extern int highscore_fd;
 
-/* scores.c */
-extern void display_scores_aux(int from, int to, int note, high_score *score);
-extern void display_scores(int from, int to);
-extern void kingly(player_type *winner_ptr);
-extern bool send_world_score(player_type *current_player_ptr, bool do_send, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name);
-extern errr top_twenty(player_type *current_player_ptr);
-extern errr predict_score(player_type *current_player_ptr);
-extern void race_legends(player_type *current_player_ptr);
-extern void race_score(player_type *current_player_ptr, int race_num);
-extern void show_highclass(player_type *current_player_ptr);
-extern bool check_score(player_type *current_player_ptr);
+void display_scores_aux(int from, int to, int note, high_score *score);
+void display_scores(int from, int to);
+void kingly(player_type *winner_ptr);
+bool send_world_score(player_type *current_player_ptr, bool do_send, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name);
+errr top_twenty(player_type *current_player_ptr);
+errr predict_score(player_type *current_player_ptr);
+void race_legends(player_type *current_player_ptr);
+void race_score(player_type *current_player_ptr, int race_num);
+void show_highclass(player_type *current_player_ptr);
+bool check_score(player_type *current_player_ptr);

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index ced1268..93b8c19 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -33,7 +33,7 @@
 
 #include "dungeon/dungeon-file.h"
 #include "cmd-item/cmd-activate.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "combat/monster-attack-effect.h"
 #include "combat/monster-attack-types.h"
 #include "dungeon/dungeon.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 8d25c1f..fcea4ab 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 "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"

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

diff --git a/src/io/files-util.c b/src/io/files-util.c
index f1355a1..87d6f7f 100644 (file)
--- a/src/io/files-util.c
+++ b/src/io/files-util.c
@@ -11,7 +11,6 @@
  * </pre>
  */
 
-#include "system/angband.h"
 #include "io/uid-checker.h"
 #include "io/files-util.h"
 #include "io-dump/character-dump.h"

diff --git a/src/io/files-util.h b/src/io/files-util.h
index 8d0e327..d102c95 100644 (file)
--- a/src/io/files-util.h
+++ b/src/io/files-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 extern char savefile[1024];
 extern char savefile_base[40];
 

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

diff --git a/src/io/save.c b/src/io/save.c
index 978414e..36f9f77 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -32,7 +32,7 @@
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "monster/monster-race.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/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 79a5329..60070f1 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 "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "cmd-action/cmd-pet.h"
 #include "dungeon/dungeon-file.h"
 #include "object/object2.h"

diff --git a/src/main/init.c b/src/main/init.c
index e2e4592..4fbfc10 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -30,7 +30,7 @@
  */
 
 #include "main/init.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "dungeon/dungeon-file.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 50ea653..d29d237 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -16,7 +16,7 @@
 #include "term/gameterm.h"
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "pet/pet-fall-off.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 465dc39..30d513b 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 "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "io/write-diary.h"
 #include "autopick/autopick-pref-processor.h"
 #include "cmd-io/cmd-process-screen.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index a7ecc64..b112a62 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -18,7 +18,7 @@
 #include "birth/birth-stat.h"
 #include "birth/character-builder.h"
 #include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "combat/snipe.h"
 #include "core/stuff-handler.h"
 #include "dungeon/quest.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 7d3540e..78d5baf 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -6,7 +6,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd-item/cmd-magiceat.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "combat/attack-power-table.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/player/player-status.h b/src/player/player-status.h
index fa3b1dc..2e2963a 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -1,6 +1,6 @@
 #pragma once 
 
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "object/object-util.h"
 #include "player/player-personalities-table.h"
 

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 3b990ba..051aa5c 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -16,7 +16,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd-io/cmd-save.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "combat/snipe.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 163ec7f..7652e60 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -14,7 +14,7 @@
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-util.h"
-#include "cmd/cmd-building.h"
+#include "cmd-building/cmd-building.h"
 #include "core/player-processor.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"