[Refactor] #40457 Renamed mind.c/h and racial.c/h to mind-switcher.c/h and racial...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0e8ceab..0882baf 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1123,7 +1123,7 @@
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
     <ClCompile Include="..\..\src\savedata\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
-    <ClCompile Include="..\..\src\mind\mind.c" />\r
+    <ClCompile Include="..\..\src\mind\mind-switcher.c" />\r
     <ClCompile Include="..\..\src\monster\monster-info.c" />\r
     <ClCompile Include="..\..\src\monster\monster-list.c" />\r
     <ClCompile Include="..\..\src\mspell\mspells1.c" />\r
@@ -1132,7 +1132,7 @@
     <ClCompile Include="..\..\src\mspell\assign-monster-spell.c" />\r
     <ClCompile Include="..\..\src\mutation\mutation.c" />\r
     <ClCompile Include="..\..\src\object\object-info.c" />\r
-    <ClCompile Include="..\..\src\racial\racial.c" />\r
+    <ClCompile Include="..\..\src\racial\racial-switcher.c" />\r
     <ClCompile Include="..\..\src\term\readdib.c" />\r
     <ClCompile Include="..\..\src\realm\realm-arcane.c" />\r
     <ClCompile Include="..\..\src\realm\realm-chaos.c" />\r
@@ -1369,7 +1369,7 @@
     <ClInclude Include="..\..\src\io\inet.h" />\r
     <ClInclude Include="..\..\src\main\init.h" />\r
     <ClInclude Include="..\..\src\savedata\load.h" />\r
-    <ClInclude Include="..\..\src\mind\mind.h" />\r
+    <ClInclude Include="..\..\src\mind\mind-switcher.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
@@ -1395,7 +1395,7 @@
     <ClInclude Include="..\..\src\player\player-skill.h" />\r
     <ClInclude Include="..\..\src\player\player-status.h" />\r
     <ClInclude Include="..\..\src\dungeon\quest.h" />\r
-    <ClInclude Include="..\..\src\racial\racial.h" />\r
+    <ClInclude Include="..\..\src\racial\racial-switcher.h" />\r
     <ClInclude Include="..\..\src\term\readdib.h" />\r
     <ClInclude Include="..\..\src\realm\realm-arcane.h" />\r
     <ClInclude Include="..\..\src\realm\realm-chaos.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index cd6a562..7cb0d99 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -521,9 +521,6 @@
     <ClCompile Include="..\..\src\io\targeting.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\mind\mind.c">
-      <Filter>mind</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\player\selfinfo.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -1763,9 +1760,6 @@
     <ClCompile Include="..\..\src\mind\stances-table.c">
       <Filter>mind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\racial\racial.c">
-      <Filter>racial</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\racial\racial-android.c">
       <Filter>racial</Filter>
     </ClCompile>
@@ -1781,6 +1775,12 @@
     <ClCompile Include="..\..\src\racial\racial-vampire.c">
       <Filter>racial</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\racial\racial-switcher.c">
+      <Filter>racial</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\mind\mind-switcher.c">
+      <Filter>mind</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -2350,9 +2350,6 @@
     <ClInclude Include="..\..\src\io\targeting.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mind\mind.h">
-      <Filter>mind</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\player\selfinfo.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -3859,9 +3856,6 @@
     <ClInclude Include="..\..\src\mind\stances-table.h">
       <Filter>mind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\racial\racial.h">
-      <Filter>racial</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\racial\racial-android.h">
       <Filter>racial</Filter>
     </ClInclude>
@@ -3880,6 +3874,12 @@
     <ClInclude Include="..\..\src\mind\snipe-types.h">
       <Filter>mind</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\racial\racial-switcher.h">
+      <Filter>racial</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\mind\mind-switcher.h">
+      <Filter>mind</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index bbed6d3..ac05b7f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -344,7 +344,6 @@ hengband_SOURCES = \
        melee/melee-util.c melee/melee-util.h \
        \
        mind/drs-types.h \
-       mind/mind.c mind/mind.h \
        mind/mind-blue-mage.h \
        mind/mind-cavalry.c mind/mind-cavalry.h \
        mind/mind-force-trainer.c mind/mind-force-trainer.h \
@@ -355,6 +354,7 @@ hengband_SOURCES = \
        mind/mind-ninja.c mind/mind-ninja.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-warrior.c mind/mind-warrior.h \
        mind/mind-warrior-mage.c mind/mind-warrior-mage.h \
        mind/mind-weaponsmith.c mind/mind-weaponsmith.h \
@@ -524,11 +524,11 @@ hengband_SOURCES = \
        player-attack/blood-sucking-processor.c player-attack/blood-sucking-processor.h \
        player-attack/player-attack.c player-attack/player-attack.h \
        \
-       racial/racial.c racial/racial.h \
        racial/racial-android.c racial/racial-android.h \
        racial/racial-balrog.c racial/racial-balrog.h \
        racial/racial-draconian.c racial/racial-draconian.h \
        racial/racial-kutar.c racial/racial-kutar.h \
+       racial/racial-switcher.c racial/racial-switcher.h \
        racial/racial-vampire.c racial/racial-vampire.h \
        \
        realm/realm-arcane.c realm/realm-arcane.h \

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 7ee14f5..4c6db28 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -27,7 +27,7 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "mind/mind.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 274519e..0a53098 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -65,13 +65,13 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/mind-sniper.h"
-#include "mind/mind.h" // do_cmd_mind_browse() がある。後で移設する.
+#include "mind/mind-switcher.h" // do_cmd_mind_browse() がある。後で移設する.
 #include "mind/snipe-types.h"
 #include "mspell/mspells3.h" // do_cmd_cast_learned() がある。後で移設する.
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"
 #include "player/special-defense-types.h"
-#include "racial/racial.h" // do_cmd_racial_power() がある。ファイル名変更？.
+#include "racial/racial-switcher.h" // do_cmd_racial_power() がある。ファイル名変更？.
 #include "spell/spells-object.h"
 #include "status/action-setter.h"
 #include "store/home.h"

diff --git a/src/io/store-key-processor.c b/src/io/store-key-processor.c
index 4626716..6e6bfac 100644 (file)
--- a/src/io/store-key-processor.c
+++ b/src/io/store-key-processor.c
@@ -19,7 +19,7 @@
 #include "io/command-repeater.h"
 #include "io/input-key-requester.h"
 #include "mind/mind-sniper.h"
-#include "mind/mind.h"
+#include "mind/mind-switcher.h"
 #include "store/home.h"
 #include "store/museum.h"
 #include "store/purchase-order.h"

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

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

diff --git a/src/racial/racial.c b/src/racial/racial-switcher.c
similarity index 99%
rename from src/racial/racial.c
rename to src/racial/racial-switcher.c
index 4fa331a..63986aa 100644 (file)
--- a/src/racial/racial.c
+++ b/src/racial/racial-switcher.c
@@ -9,7 +9,7 @@
  * 2014 Deskull rearranged comment for Doxygen. \n
  */
 
-#include "racial/racial.h"
+#include "racial/racial-switcher.h"
 #include "action/action-limited.h"
 #include "cmd-action/cmd-mane.h"
 #include "cmd-action/cmd-spell.h"

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

diff --git a/src/window/display-sub-window-spells.c b/src/window/display-sub-window-spells.c
index 418bd67..a99eb05 100644 (file)
--- a/src/window/display-sub-window-spells.c
+++ b/src/window/display-sub-window-spells.c
@@ -2,7 +2,7 @@
 #include "core/window-redrawer.h"
 #include "game-option/option-flags.h"
 #include "mind/mind-sniper.h"
-#include "mind/mind.h"
+#include "mind/mind-switcher.h"
 #include "player/player-class.h"
 #include "realm/realm-names-table.h"
 #include "spell/spells-execution.h"