[Refactor] #40573 Renamed mind-switcher.c/h to cmd-mind.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index bf8b39a..b565281 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1228,7 +1228,7 @@
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
     <ClCompile Include="..\..\src\load\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
-    <ClCompile Include="..\..\src\mind\mind-switcher.c" />\r
+    <ClCompile Include="..\..\src\cmd-action\cmd-mind.c" />\r
     <ClCompile Include="..\..\src\monster\monster-info.c" />\r
     <ClCompile Include="..\..\src\monster\monster-list.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-checker.c" />\r
@@ -1474,7 +1474,7 @@
     <ClInclude Include="..\..\src\io\inet.h" />\r
     <ClInclude Include="..\..\src\main\init.h" />\r
     <ClInclude Include="..\..\src\load\load.h" />\r
-    <ClInclude Include="..\..\src\mind\mind-switcher.h" />\r
+    <ClInclude Include="..\..\src\cmd-action\cmd-mind.h" />\r
     <ClInclude Include="..\..\src\monster\monster-processor.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
     <ClInclude Include="..\..\src\system\monster-type-definition.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 172ea3c..fa3a932 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1760,9 +1760,6 @@
     <ClCompile Include="..\..\src\racial\racial-switcher.c">
       <Filter>racial</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\mind\mind-switcher.c">
-      <Filter>mind</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\floor\cave.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -1928,6 +1925,9 @@
     <ClCompile Include="..\..\src\mind\mind-berserker.c">
       <Filter>mind</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd-action\cmd-mind.c">
+      <Filter>cmd-action</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -4006,9 +4006,6 @@
     <ClInclude Include="..\..\src\racial\racial-switcher.h">
       <Filter>racial</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mind\mind-switcher.h">
-      <Filter>mind</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\floor\floor-base-definitions.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -4195,6 +4192,9 @@
     <ClInclude Include="..\..\src\mind\mind-berserker.h">
       <Filter>mind</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd-action\cmd-mind.h">
+      <Filter>cmd-action</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index b171d49..d81428b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,6 +89,7 @@ hengband_SOURCES = \
        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-mind.c cmd-action/cmd-mind.h \
        cmd-action/cmd-move.c cmd-action/cmd-move.h \
        cmd-action/cmd-open-close.c cmd-action/cmd-open-close.h \
        cmd-action/cmd-others.c cmd-action/cmd-others.h \
@@ -400,7 +401,6 @@ hengband_SOURCES = \
        mind/mind-power-getter.c mind/mind-power-getter.h \
        mind/mind-samurai.c mind/mind-samurai.h \
        mind/mind-sniper.c mind/mind-sniper.h \
-       mind/mind-switcher.c mind/mind-switcher.h \
        mind/mind-types.h \
        mind/mind-warrior.c mind/mind-warrior.h \
        mind/mind-warrior-mage.c mind/mind-warrior-mage.h \

diff --git a/src/mind/mind-switcher.c b/src/cmd-action/cmd-mind.c
similarity index 99%
rename from src/mind/mind-switcher.c
rename to src/cmd-action/cmd-mind.c
index 823e2fb..39b620b 100644 (file)
--- a/src/mind/mind-switcher.c
+++ b/src/cmd-action/cmd-mind.c
@@ -13,7 +13,7 @@
  * 特殊技能を揃えて実装している。
  */
 
-#include "mind/mind-switcher.h"
+#include "cmd-action/cmd-mind.h"
 #include "action/action-limited.h"
 #include "action/movement-execution.h"
 #include "cmd-action/cmd-attack.h"

diff --git a/src/mind/mind-switcher.h b/src/cmd-action/cmd-mind.h
similarity index 100%
rename from src/mind/mind-switcher.h
rename to src/cmd-action/cmd-mind.h

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 4dcaf98..0d4357b 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -8,6 +8,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "action/action-limited.h"
 #include "autopick/autopick-reader-writer.h"
+#include "cmd-action/cmd-mind.h"
 #include "cmd-io/cmd-dump.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
@@ -26,7 +27,6 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "mind/mind-switcher.h"
 #include "object-hook/hook-magic.h"
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 1bfcde2..9caccf7 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -9,6 +9,7 @@
 #include "autopick/autopick-pref-processor.h"
 #include "cmd-action/cmd-hissatsu.h"
 #include "cmd-action/cmd-mane.h"
+#include "cmd-action/cmd-mind.h"
 #include "cmd-action/cmd-move.h"
 #include "cmd-action/cmd-open-close.h"
 #include "cmd-action/cmd-others.h"
@@ -67,7 +68,6 @@
 #include "main/sound-of-music.h"
 #include "mind/mind-blue-mage.h"
 #include "mind/mind-sniper.h"
-#include "mind/mind-switcher.h" // do_cmd_mind_browse() がある。後で移設する.
 #include "mind/snipe-types.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"

diff --git a/src/io/store-key-processor.c b/src/io/store-key-processor.c
index 6e6bfac..89276c9 100644 (file)
--- a/src/io/store-key-processor.c
+++ b/src/io/store-key-processor.c
@@ -1,5 +1,6 @@
 #include "io/store-key-processor.h"
 #include "autopick/autopick-pref-processor.h"
+#include "cmd-action/cmd-mind.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-diary.h"
 #include "cmd-io/cmd-dump.h"
@@ -19,7 +20,6 @@
 #include "io/command-repeater.h"
 #include "io/input-key-requester.h"
 #include "mind/mind-sniper.h"
-#include "mind/mind-switcher.h"
 #include "store/home.h"
 #include "store/museum.h"
 #include "store/purchase-order.h"