[Refactor] #40479 Renamed mspells1.c/h to mspell-checker.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index cfb0f3b..77e8602 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -823,7 +823,7 @@
     <ClInclude Include="..\..\src\mspell\monster-power-table.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-dispel.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-mask-definitions.h" />\r
-    <ClInclude Include="..\..\src\mspell\mspells1.h" />\r
+    <ClInclude Include="..\..\src\mspell\mspell-checker.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-judgement.h" />\r
     <ClInclude Include="..\..\src\blue-magic\blue-magic-checker.h" />\r
     <ClInclude Include="..\..\src\mutation\mutation-flag-types.h" />\r
@@ -1185,7 +1185,7 @@
     <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
+    <ClCompile Include="..\..\src\mspell\mspell-checker.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-judgement.c" />\r
     <ClCompile Include="..\..\src\blue-magic\blue-magic-checker.c" />\r
     <ClCompile Include="..\..\src\mspell\assign-monster-spell.c" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 3f6abd2..3dc3a66 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -563,9 +563,6 @@
     <ClCompile Include="..\..\src\mspell\mspell-learn-checker.c">
       <Filter>mspell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\mspell\mspells1.c">
-      <Filter>mspell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mspell\mspell-ball.c">
       <Filter>mspell</Filter>
     </ClCompile>
@@ -1865,6 +1862,9 @@
     <ClCompile Include="..\..\src\mspell\mspell-attack.c">
       <Filter>mspell</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\mspell\mspell-checker.c">
+      <Filter>mspell</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3478,9 +3478,6 @@
     <ClInclude Include="..\..\src\mspell\monster-power-table.h">
       <Filter>mspell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mspell\mspells1.h">
-      <Filter>mspell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\view\status-bars-table.h">
       <Filter>view</Filter>
     </ClInclude>
@@ -4057,6 +4054,9 @@
     <ClInclude Include="..\..\src\mspell\mspell-attack.h">
       <Filter>mspell</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\mspell\mspell-checker.h">
+      <Filter>mspell</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 11993b7..6a3f025 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -461,11 +461,11 @@ hengband_SOURCES = \
        mspell/high-resistance-checker.c mspell/high-resistance-checker.h \
        mspell/improper-mspell-remover.c mspell/improper-mspell-remover.h \
        mspell/monster-power-table.c mspell/monster-power-table.h \
-       mspell/mspells1.c mspell/mspells1.h \
        mspell/mspell-attack.c mspell/mspell-attack.h \
        mspell/mspell-breath.c mspell/mspell-breath.h \
        mspell/mspell-ball.c mspell/mspell-ball.h \
        mspell/mspell-bolt.c mspell/mspell-bolt.h \
+       mspell/mspell-checker.c mspell/mspell-checker.h \
        mspell/mspell-curse.c mspell/mspell-curse.h \
        mspell/mspell-dispel.c mspell/mspell-dispel.h \
        mspell/mspell-judgement.c mspell/mspell-judgement.h \

diff --git a/src/melee/melee-spell-flags-checker.c b/src/melee/melee-spell-flags-checker.c
index 9006794..583407a 100644 (file)
--- a/src/melee/melee-spell-flags-checker.c
+++ b/src/melee/melee-spell-flags-checker.c
@@ -15,10 +15,10 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-judgement.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "pet/pet-util.h"
 #include "spell-kind/spells-world.h"
 #include "spell/spell-types.h"

diff --git a/src/melee/melee-spell.c b/src/melee/melee-spell.c
index 94b8145..6c8a1fb 100644 (file)
--- a/src/melee/melee-spell.c
+++ b/src/melee/melee-spell.c
@@ -8,8 +8,8 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "mspell/assign-monster-spell.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell-realm/spells-hex.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/monster-floor/monster-safety-hiding.c b/src/monster-floor/monster-safety-hiding.c
index 58e8f61..e6c50d0 100644 (file)
--- a/src/monster-floor/monster-safety-hiding.c
+++ b/src/monster-floor/monster-safety-hiding.c
@@ -12,7 +12,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
-#include "mspell/mspells1.h"
+#include "mspell/mspell-checker.h"
 #include "system/floor-type-definition.h"
 
  /*!

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index ee3a9a6..c868962 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -50,7 +50,6 @@
 #include "monster/monster-util.h"
 #include "mspell/mspell-attack.h"
 #include "mspell/mspell-judgement.h"
-#include "mspell/mspells1.h"
 #include "object-enchant/trc-types.h"
 #include "pet/pet-fall-off.h"
 #include "player/avatar.h"

diff --git a/src/mspell/mspell-attack.c b/src/mspell/mspell-attack.c
index b8ced3f..aa770d5 100644 (file)
--- a/src/mspell/mspell-attack.c
+++ b/src/mspell/mspell-attack.c
@@ -25,11 +25,11 @@
 #include "monster/monster-status.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/improper-mspell-remover.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-judgement.h"
 #include "mspell/mspell-mask-definitions.h"
 #include "mspell/mspell-selector.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "player/attack-defense-types.h"
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/mspell/mspell-ball.c b/src/mspell/mspell-ball.c
index 5603004..23a72cf 100644 (file)
--- a/src/mspell/mspell-ball.c
+++ b/src/mspell/mspell-ball.c
@@ -5,7 +5,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "mspell/mspells1.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"

diff --git a/src/mspell/mspell-bolt.c b/src/mspell/mspell-bolt.c
index 7213bcf..70a3d36 100644 (file)
--- a/src/mspell/mspell-bolt.c
+++ b/src/mspell/mspell-bolt.c
@@ -4,10 +4,10 @@
 #include "mind/drs-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell/spell-types.h"
 
 /*!

diff --git a/src/mspell/mspell-breath.c b/src/mspell/mspell-breath.c
index fea8018..405b958 100644 (file)
--- a/src/mspell/mspell-breath.c
+++ b/src/mspell/mspell-breath.c
@@ -6,9 +6,9 @@
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell/spell-types.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspell-checker.c
similarity index 99%
rename from src/mspell/mspells1.c
rename to src/mspell/mspell-checker.c
index 67ecd9b..8357cc0 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspell-checker.c
@@ -9,7 +9,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "mspell/mspells1.h"
+#include "mspell/mspell-checker.h"
 #include "blue-magic/blue-magic-checker.h"
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"

diff --git a/src/mspell/mspells1.h b/src/mspell/mspell-checker.h
similarity index 100%
rename from src/mspell/mspells1.h
rename to src/mspell/mspell-checker.h

diff --git a/src/mspell/mspell-curse.c b/src/mspell/mspell-curse.c
index ba07959..20885f7 100644 (file)
--- a/src/mspell/mspell-curse.c
+++ b/src/mspell/mspell-curse.c
@@ -2,10 +2,10 @@
 #include "core/disturbance.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell/spell-types.h"
 #include "system/floor-type-definition.h"
 #include "view/display-messages.h"

diff --git a/src/mspell/mspell-particularity.c b/src/mspell/mspell-particularity.c
index d13c403..fe5361e 100644 (file)
--- a/src/mspell/mspell-particularity.c
+++ b/src/mspell/mspell-particularity.c
@@ -11,10 +11,10 @@
 #include "mspell/mspell-particularity.h"
 #include "mind/drs-types.h"
 #include "monster/monster-update.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell/spell-types.h"
 
 /*!

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index 14bf2d0..6d0adaf 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -23,8 +23,8 @@
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-util.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "player/player-damage.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell-realm/spells-crusade.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index 6e9da0c..6085dbb 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -18,9 +18,9 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "player/player-personalities-types.h"
 #include "spell/spell-types.h"
 #include "status/bad-status-setter.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 6f03f51..27d6305 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -13,7 +13,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "mspell/specified-summon.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/process-effect.h"

diff --git a/src/mspell/specified-summon.c b/src/mspell/specified-summon.c
index cfed004..1ecb565 100644 (file)
--- a/src/mspell/specified-summon.c
+++ b/src/mspell/specified-summon.c
@@ -7,8 +7,8 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
+#include "mspell/mspell-checker.h"
 #include "mspell/mspell-util.h"
-#include "mspell/mspells1.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"