[Refactor] #40457 Moved action-realated cmd-*.c/h to cmd-action/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index cfb38a5..bc96551 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -167,7 +167,7 @@
     <ClCompile Include="..\..\src\birth\initial-equipments-table.c" />\r
     <ClCompile Include="..\..\src\birth\inventory-initializer.c" />\r
     <ClCompile Include="..\..\src\birth\quick-start.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-attack.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-attack.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-menu-content-table.c" />\r
     <ClCompile Include="..\..\src\combat\attack-chaos-effect.c" />\r
     <ClCompile Include="..\..\src\combat\attack-criticality.c" />\r
@@ -305,19 +305,19 @@
     <ClCompile Include="..\..\src\cmd-item\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-gameoption.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-help.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-hissatsu.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-hissatsu.c" />\r
     <ClCompile Include="..\..\src\cmd\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
     <ClCompile Include="..\..\src\cmd-item\cmd-magiceat.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-mane.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-pet.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-mane.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-pet.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-quaff.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-read.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-save.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-smith.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-spell.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-spell.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-usestaff.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-visuals.c" />\r
     <ClCompile Include="..\..\src\cmd-item\cmd-zaprod.c" />\r
@@ -442,7 +442,7 @@
     <ClInclude Include="..\..\src\birth\initial-equipments-table.h" />\r
     <ClInclude Include="..\..\src\birth\inventory-initializer.h" />\r
     <ClInclude Include="..\..\src\birth\quick-start.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-attack.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-attack.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-menu-content-table.h" />\r
     <ClInclude Include="..\..\src\combat\attack-chaos-effect.h" />\r
     <ClInclude Include="..\..\src\combat\attack-criticality.h" />\r
@@ -716,19 +716,19 @@
     <ClInclude Include="..\..\src\cmd-item\cmd-eat.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-gameoption.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-help.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-hissatsu.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-hissatsu.h" />\r
     <ClInclude Include="..\..\src\cmd\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
     <ClInclude Include="..\..\src\cmd-item\cmd-magiceat.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-mane.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-pet.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-mane.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-pet.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-quaff.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-read.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-save.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-smith.h" />\r
-    <ClInclude Include="..\..\src\cmd\cmd-spell.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-spell.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-usestaff.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-visuals.h" />\r
     <ClInclude Include="..\..\src\cmd-item\cmd-zaprod.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 674e23d..47654ab 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1052,19 +1052,19 @@
     <ClCompile Include="..\..\src\cmd-io\feeling-table.c">
       <Filter>cmd-io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-attack.c">
+    <ClCompile Include="..\..\src\cmd-action\cmd-attack.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-hissatsu.c">
+    <ClCompile Include="..\..\src\cmd-action\cmd-hissatsu.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-mane.c">
+    <ClCompile Include="..\..\src\cmd-action\cmd-mane.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-pet.c">
+    <ClCompile Include="..\..\src\cmd-action\cmd-pet.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-spell.c">
+    <ClCompile Include="..\..\src\cmd-action\cmd-spell.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
   </ItemGroup>
@@ -2269,19 +2269,19 @@
     <ClInclude Include="..\..\src\cmd-io\feeling-table.h">
       <Filter>cmd-io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-attack.h">
+    <ClInclude Include="..\..\src\cmd-action\cmd-attack.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-hissatsu.h">
+    <ClInclude Include="..\..\src\cmd-action\cmd-hissatsu.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-mane.h">
+    <ClInclude Include="..\..\src\cmd-action\cmd-mane.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-pet.h">
+    <ClInclude Include="..\..\src\cmd-action\cmd-pet.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd\cmd-spell.h">
+    <ClInclude Include="..\..\src\cmd-action\cmd-spell.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/Makefile.am b/src/Makefile.am
index e412c8e..deb054b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -338,12 +338,15 @@ hengband_SOURCES = \
        cmd/object-group-table.c cmd/object-group-table.h \
        cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \
        cmd/cmd-draw.c cmd/cmd-draw.h \
-       cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h cmd/cmd-inn.c cmd/cmd-inn.h \
+       cmd/cmd-inn.c cmd/cmd-inn.h \
        cmd/lighting-level-table.c cmd/lighting-level-table.h \
-       cmd/cmd-mane.c cmd/cmd-mane.h \
-       cmd/cmd-pet.c cmd/cmd-pet.h \
-       cmd/cmd-spell.c cmd/cmd-spell.h cmd/cmd-visuals.c cmd/cmd-visuals.h \
-       cmd/cmd-attack.c cmd/cmd-attack.h \
+       cmd/cmd-visuals.c cmd/cmd-visuals.h \
+       \
+       cmd-action/cmd-attack.c cmd-action/cmd-attack.h \
+       cmd-action/cmd-hissatsu.c cmd-action/cmd-hissatsu.h \
+       cmd-action/cmd-mane.c cmd-action/cmd-mane.h \
+       cmd-action/cmd-pet.c cmd-action/cmd-pet.h \
+       cmd-action/cmd-spell.c cmd-action/cmd-spell.h \
        \
        cmd-io/cmd-diary.c cmd/-iocmd-diary.h \
        cmd-io/cmd-dump.c cmd-io/cmd-dump.h \

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index cab9675..707387d 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
 #include "combat/player-attack.h"

diff --git a/src/cmd-action/cmd-hissatsu.c b/src/cmd-action/cmd-hissatsu.c
index a299b07..4df5598 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.c
+++ b/src/cmd-action/cmd-hissatsu.c
@@ -23,7 +23,7 @@
 #include "object/item-use-flags.h"
 
 #include "cmd/cmd-basic.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "view/display-main-window.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index a70045d..d297126 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -22,7 +22,7 @@
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
 #include "monster/monster-process.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "cmd/cmd-basic.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index d45cc47..20d28d9 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -15,13 +15,13 @@
 #include "object/object-hook.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "cmd/cmd-basic.h"
 #include "view/display-main-window.h"
 #include "io/targeting.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "pet/pet-util.h"
 
 int total_friends = 0;

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 70fe23a..7ad87e8 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -10,7 +10,7 @@
 #include "core/stuff-handler.h"
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 5cb8e00..7d70d87 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -23,7 +23,7 @@
 #include "cmd-item/cmd-usestaff.h"
 #include "cmd-item/cmd-zaprod.h"
 #include "cmd-item/cmd-zapwand.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "cmd/cmd-basic.h"
 #include "object/object2.h"
 #include "object/item-feeling.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index d82ab80..a81a3f0 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -60,7 +60,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/spells3.h"
 #include "core/output-updater.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "object/tr-types.h"
 
 /*!

diff --git a/src/cmd/cmd-building.c b/src/cmd/cmd-building.c
index 9abc20a..7a577ba 100644 (file)
--- a/src/cmd/cmd-building.c
+++ b/src/cmd/cmd-building.c
@@ -30,7 +30,7 @@
 #include "player/avatar.h"
 #include "cmd/cmd-building.h"
 #include "mutation/mutation.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells3.h"
 #include "spell/spells-status.h"
 #include "io/files-util.h"

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index 2310334..1b98f9d 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -5,8 +5,8 @@
  */
 
 #include "combat/monster-attack-player.h"
-#include "cmd/cmd-attack.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-attack.h"
+#include "cmd-action/cmd-pet.h"
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
 #include "combat/combat-options-type.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 38b3c81..3bd6f39 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -10,7 +10,7 @@
 #include "player/player-effects.h"
 #include "floor/pattern-walk.h"
 #include "core/hp-mp-regenerator.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "player/player-races-table.h"
 #include "object/trc-types.h"
 

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 15e8895..fca64d0 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -13,7 +13,7 @@
 #include "player/avatar.h"
 #include "monster/monster-status.h"
 #include "monster/monster-race-hook.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "effect/effect-monster-resist-hurt.h"

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index e64f444..39da2ec 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -16,7 +16,7 @@
 #include "spell/spells-type.h"
 #include "world/world.h"
 #include "player/player-races-table.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 
 void effect_player_mana(player_type *target_ptr, effect_player_type *ep_ptr) {
   if (target_ptr->blind)

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 91ec884..d702bf4 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -40,21 +40,21 @@
 #include "cmd-io/cmd-process-screen.h"
 #include "cmd-item/cmd-eat.h"
 #include "cmd-io/cmd-help.h"
-#include "cmd/cmd-hissatsu.h"
+#include "cmd-action/cmd-hissatsu.h"
 #include "cmd-item/cmd-item.h"
 #include "cmd-io/cmd-knowledge.h"
 #include "cmd-item/cmd-magiceat.h"
-#include "cmd/cmd-mane.h"
+#include "cmd-action/cmd-mane.h"
 #include "cmd-io/cmd-macro.h"
 #include "cmd-item/cmd-quaff.h"
 #include "cmd-item/cmd-read.h"
 #include "cmd-io/cmd-save.h"
 #include "cmd-item/cmd-smith.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-usestaff.h"
 #include "cmd-item/cmd-zaprod.h"
 #include "cmd-item/cmd-zapwand.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-visuals.h"
 #include "wizard/wizard-spoiler.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 20b6ffb..79a5329 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -18,7 +18,7 @@
 #include "io/targeting.h"
 
 #include "cmd/cmd-building.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "dungeon/dungeon-file.h"
 #include "object/object2.h"
 #include "object/object-curse.h"

diff --git a/src/mind/mind.c b/src/mind/mind.c
index 9520405..cc5ced5 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -28,7 +28,7 @@
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "spell/spells-status.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-floor.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
@@ -46,7 +46,7 @@
 #include "spell/spells3.h"
 #include "spell/spells-detection.h"
 #include "mind/racial-force-trainer.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/mind/racial-samurai.c b/src/mind/racial-samurai.c
index 75f80c2..89ec6c1 100644 (file)
--- a/src/mind/racial-samurai.c
+++ b/src/mind/racial-samurai.c
@@ -5,9 +5,9 @@
  */
 
 #include "racial-samurai.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "cmd/cmd-basic.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "monster/monster-status.h"
 #include "player/player-effects.h"
 #include "player/avatar.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index dcb403a..0b155de 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -17,7 +17,7 @@
 
 #include "cmd/cmd-basic.h"
 #include "cmd-item/cmd-magiceat.h"
-#include "cmd/cmd-mane.h"
+#include "cmd-action/cmd-mane.h"
 #include "cmd-item/cmd-zapwand.h"
 #include "combat/melee-postprocess.h"
 #include "object/object-hook.h"
@@ -30,7 +30,7 @@
 #include "spell/spells-status.h"
 #include "spell/spells-object.h"
 #include "spell/spells-floor.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "realm/realm-hex.h"
 #include "io/targeting.h"
 #include "view/display-main-window.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index 4891c63..431069c 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -20,7 +20,7 @@
 #include "spell/spells-summon.h"
 #include "player/avatar.h"
 #include "spell/spells-status.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/player-status.h"
 #include "mspell/monster-spell.h"
 #include "monster/monster-status.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 83ae7eb..a1488f6 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -18,7 +18,7 @@
 #include "term/gameterm.h"
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells3.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/player/patron.c b/src/player/patron.c
index f08b6c3..71a1151 100644 (file)
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -4,7 +4,7 @@
 #include "io/write-diary.h"
 #include "cmd-io/cmd-dump.h"
 #include "player/patron.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "object/object-curse.h"
 #include "object/object-flavor.h"
 #include "monster/monster-race-hook.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 3727262..041bd65 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -180,7 +180,7 @@
 #include "io/targeting.h"
 #include "spell/process-effect.h"
 #include "spell/spells3.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 
 travel_type travel;
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 8a8db4c..02eda55 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -36,9 +36,9 @@
 #include "player/patron.h"
 #include "realm/realm-hex.h"
 #include "realm/realm-song.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "pet/pet-util.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "dungeon/dungeon.h"
 #include "object/object-kind.h"
 #include "monster/monster-race.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 79ff32a..54f233f 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/avatar.h"
 
 #include "spell/spells2.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index b4460e2..5920bb3 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "spell/spells-summon.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index 36e594c..6b97baf 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/selfinfo.h"
 #include "spell/spells1.h"
 #include "spell/spells-object.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index bc95df7..14a2d4c 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -2,7 +2,7 @@
 #include "util/util.h"
 
 #include "world/world.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "effect/effect-characteristics.h"
 #include "spell/spells-type.h"
 #include "spell/spells-object.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index d1de199..6616253 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -2,7 +2,7 @@
 #include "util/util.h"
 
 #include "player/player-class.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-floor.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index c64e162..633a3fc 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index cbf8338..ce0940a 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -19,7 +19,7 @@
 #include "util/util.h"
 
 #include "effect/effect-characteristics.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-quaff.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 664625a..dafa63e 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -2,7 +2,7 @@
 #include "core/stuff-handler.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "cmd/cmd-basic.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
@@ -28,7 +28,7 @@
 #include "spell/spells3.h"
 #include "spell/spells-detection.h"
 #include "combat/combat-options-type.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "object/tr-types.h"
 
 /*!

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index a3f8bf5..56ebfbd 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"
 #include "spell/spells2.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 08fb205..6711c66 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"
 #include "spell/spells-object.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 93dffdc..138024b 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "spell/spells-type.h"
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 7cf870a..d9fc6f0 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/selfinfo.h"
 #include "player/avatar.h"
 

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 8f7007c..856e979 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "mutation/mutation.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 6068733..5ac0836 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -11,7 +11,7 @@
 #include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "monster/monster.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "player/player-effects.h"
 #include "object/object2.h"
 #include "object/object-kind.h"

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index 3a62bca..8573157 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -16,7 +16,7 @@
 #include "system/system-variables.h"
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "cmd-io/cmd-dump.h"
 #include "player/player-class.h"
 #include "monster/monster.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 95b4ed6..7b0bdb5 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -21,7 +21,7 @@
 
 #include "object/artifact.h"
 #include "io/write-diary.h"
-#include "cmd/cmd-pet.h"
+#include "cmd-action/cmd-pet.h"
 #include "pet/pet-util.h"
 #include "pet/pet-fall-off.h"
 #include "cmd-io/cmd-dump.h"
@@ -66,7 +66,7 @@
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
 #include "combat/combat-options-type.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "object/special-object-flags.h"
 #include "object/sv-food-types.h"
 

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index d9b6e59..ec5616f 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -51,7 +51,7 @@
 #include "mspell/monster-spell.h"
 #include "io/write-diary.h"
 #include "cmd-io/cmd-save.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-dump.h"
 #include "combat/snipe.h"
 #include "floor/floor-save.h"
@@ -70,7 +70,7 @@
 #include "spell/spells-execution.h"
 #include "spell/process-effect.h"
 #include "mind/racial-force-trainer.h"
-#include "cmd/cmd-attack.h"
+#include "cmd-action/cmd-attack.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "object/special-object-flags.h"

diff --git a/src/store/store.c b/src/store/store.c
index 542c389..a7a6886 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -41,7 +41,7 @@
 #include "spell/spells3.h"
 #include "store/store.h"
 #include "player/avatar.h"
-#include "cmd/cmd-spell.h"
+#include "cmd-action/cmd-spell.h"
 #include "store/rumor.h"
 #include "player/player-status.h"
 #include "player/player-class.h"