[Refactor] #40457 Renamed music-checker.c/h to spells-song.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index cd01380..16b8aef 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -522,7 +522,7 @@
     <ClCompile Include="..\..\src\realm\realm-nature.c" />\r
     <ClCompile Include="..\..\src\realm\realm-song.c" />\r
     <ClCompile Include="..\..\src\realm\realm-sorcery.c" />\r
-    <ClCompile Include="..\..\src\spell\music-checker.c" />\r
+    <ClCompile Include="..\..\src\spell-realm\spells-song.c" />\r
     <ClCompile Include="..\..\src\spell\process-effect.c" />\r
     <ClCompile Include="..\..\src\spell\spells-execution.c" />\r
     <ClCompile Include="..\..\src\spell\technic-info-table.c" />\r
@@ -1049,7 +1049,7 @@
     <ClInclude Include="..\..\src\room\pit-nest-kinds-table.h" />\r
     <ClInclude Include="..\..\src\io\signal-handlers.h" />\r
     <ClInclude Include="..\..\src\io\uid-checker.h" />\r
-    <ClInclude Include="..\..\src\spell\music-checker.h" />\r
+    <ClInclude Include="..\..\src\spell-realm\spells-song.h" />\r
     <ClInclude Include="..\..\src\spell\process-effect.h" />\r
     <ClInclude Include="..\..\src\spell\spell-types.h" />\r
     <ClInclude Include="..\..\src\spell\spells-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 7965a25..5711ef9 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -371,9 +371,6 @@
     <ClCompile Include="..\..\src\core\player-processor.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\music-checker.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\player\digestion-processor.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -1400,6 +1397,9 @@
     <ClCompile Include="..\..\src\system\alloc-entries.c">
       <Filter>system</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\spell-realm\spells-song.c">
+      <Filter>spell-realm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -1807,9 +1807,6 @@
     <ClInclude Include="..\..\src\core\player-processor.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\music-checker.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\player\digestion-processor.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -3073,6 +3070,9 @@
     <ClInclude Include="..\..\src\system\alloc-entries.h">
       <Filter>system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spell-realm\spells-song.h">
+      <Filter>spell-realm</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ac388d1..26a2552 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -484,7 +484,6 @@ hengband_SOURCES = \
        specific-object/death-scythe.c specific-object/death-scythe.h \
        specific-object/torch.c specific-object/torch.h \
        \
-       spell/music-checker.c spell/music-checker.h \
        spell/process-effect.c spell/process-effect.h \
        spell/range-calc.c spell/range-calc.h \
        spell/spells3.c spell/spells3.h \
@@ -517,6 +516,7 @@ hengband_SOURCES = \
        \
        spell-realm/spells-crusade.c spell-realm/spells-crusade.h \
        spell-realm/spells-hex.c spell-realm/spells-hex.h \
+       spell-realm/spells-song.c spell-realm/spells-song.h \
        spell-realm/spells-trump.c spell-realm/spells-trump.h \
        \
        store/store.c store/store.h \

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 456651e..0098bc4 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -26,7 +26,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "player/player-skill.h"
-#include "spell/music-checker.h"
+#include "spell-realm/spells-song.h"
 #include "spell-kind/spells-random.h"
 #include "spell-realm/spells-hex.h"
 #include "term/screen-processor.h"

diff --git a/src/spell/music-checker.c b/src/spell-realm/spells-song.c
similarity index 98%
rename from src/spell/music-checker.c
rename to src/spell-realm/spells-song.c
index aa254b8..45ee52b 100644 (file)
--- a/src/spell/music-checker.c
+++ b/src/spell-realm/spells-song.c
@@ -1,4 +1,4 @@
-#include "spell/music-checker.h"
+#include "spell-realm/spells-song.h"
 #include "floor/floor.h"
 #include "player/player-skill.h"
 #include "realm/realm-song-numbers.h"

diff --git a/src/spell/music-checker.h b/src/spell-realm/spells-song.h
similarity index 100%
rename from src/spell/music-checker.h
rename to src/spell-realm/spells-song.h