[WIP] [Refactor] #40414 Moved concrete spell kinds file (spell-*.c/h) from spell...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index edb0bec..d8c6d16 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -355,19 +355,19 @@
     <ClCompile Include="..\..\src\mspell\mspell-summon.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-util.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-ball.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-beam.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-beam.c" />\r
     <ClCompile Include="..\..\src\spell\spells-describer.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-detection.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-genocide.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-detection.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-genocide.c" />\r
     <ClCompile Include="..\..\src\spell\spells-hex.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-launcher.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-lite.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-neighbor.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-pet.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-sight.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-specific-bolt.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-launcher.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-lite.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-neighbor.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-pet.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-sight.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-specific-bolt.c" />\r
     <ClCompile Include="..\..\src\spell\spells-staff-only.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-teleport.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-teleport.c" />\r
     <ClCompile Include="..\..\src\system\system-variables.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r
     <ClCompile Include="..\..\src\monster\creature.c" />\r
@@ -578,18 +578,18 @@
     <ClInclude Include="..\..\src\object-enchant\special-object-flags.h" />\r
     <ClInclude Include="..\..\src\realm\realm-hex-numbers.h" />\r
     <ClInclude Include="..\..\src\realm\realm-song-numbers.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-beam.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-beam.h" />\r
     <ClInclude Include="..\..\src\spell\spells-describer.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-genocide.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-genocide.h" />\r
     <ClInclude Include="..\..\src\spell\spells-hex.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-launcher.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-lite.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-neighbor.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-pet.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-sight.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-specific-bolt.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-launcher.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-lite.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-neighbor.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-pet.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-sight.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-specific-bolt.h" />\r
     <ClInclude Include="..\..\src\spell\spells-staff-only.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-teleport.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-teleport.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-amulet-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-armor-types.h" />\r
     <ClInclude Include="..\..\src\sv-definition\sv-bow-types.h" />\r
@@ -641,7 +641,7 @@
     <ClInclude Include="..\..\src\player\player-personalities-table.h" />\r
     <ClInclude Include="..\..\src\player\player-races-table.h" />\r
     <ClInclude Include="..\..\src\player\player-classes-table.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-detection.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-detection.h" />\r
     <ClInclude Include="..\..\src\system\angband-version.h" />\r
     <ClInclude Include="..\..\src\core\turn-compensator.h" />\r
     <ClInclude Include="..\..\src\effect\effect-characteristics.h" />\r
@@ -730,11 +730,11 @@
     <ClCompile Include="..\..\src\combat\snipe.c" />\r
     <ClCompile Include="..\..\src\core\sort.c" />\r
     <ClCompile Include="..\..\src\spell\spells-diceroll.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-floor.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-floor.c" />\r
     <ClCompile Include="..\..\src\spell\spells-object.c" />\r
     <ClCompile Include="..\..\src\spell\spells-status.c" />\r
     <ClCompile Include="..\..\src\spell\spells-summon.c" />\r
-    <ClCompile Include="..\..\src\spell\spells-world.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\spells-world.c" />\r
     <ClCompile Include="..\..\src\spell\range-calc.c" />\r
     <ClCompile Include="..\..\src\spell\spells2.c" />\r
     <ClCompile Include="..\..\src\spell\spells3.c" />\r
@@ -960,12 +960,12 @@
     <ClInclude Include="..\..\src\combat\snipe.h" />\r
     <ClInclude Include="..\..\src\core\sort.h" />\r
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-floor.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-floor.h" />\r
     <ClInclude Include="..\..\src\spell\spells-object.h" />\r
     <ClInclude Include="..\..\src\spell\spells-status.h" />\r
     <ClInclude Include="..\..\src\spell\spells-summon.h" />\r
     <ClInclude Include="..\..\src\floor\floor-streams.h" />\r
-    <ClInclude Include="..\..\src\spell\spells-world.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\spells-world.h" />\r
     <ClInclude Include="..\..\src\spell\range-calc.h" />\r
     <ClInclude Include="..\..\src\store\store.h" />\r
     <ClInclude Include="..\..\src\io\targeting.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index d0c94f8..fdf0da6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -533,9 +533,6 @@
     <ClCompile Include="..\..\src\spell\spells-diceroll.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-floor.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\spell\spells-object.c">
       <Filter>spell</Filter>
     </ClCompile>
@@ -545,9 +542,6 @@
     <ClCompile Include="..\..\src\spell\spells-summon.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-world.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\locale\english.c">
       <Filter>locale</Filter>
     </ClCompile>
@@ -656,9 +650,6 @@
     <ClCompile Include="..\..\src\core\sort.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-detection.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mind\racial-samurai.c">
       <Filter>mind</Filter>
     </ClCompile>
@@ -1124,21 +1115,6 @@
     <ClCompile Include="..\..\src\mind\racial-ninja.c">
       <Filter>mind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-teleport.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-launcher.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-sight.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-genocide.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-lite.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mind\racial-draconian.c">
       <Filter>mind</Filter>
     </ClCompile>
@@ -1151,17 +1127,41 @@
     <ClCompile Include="..\..\src\spell\spells-staff-only.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-pet.c">
-      <Filter>spell</Filter>
+    <ClCompile Include="..\..\src\spell-kind\spells-beam.c">
+      <Filter>spell-kind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-beam.c">
-      <Filter>spell</Filter>
+    <ClCompile Include="..\..\src\spell-kind\spells-detection.c">
+      <Filter>spell-kind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-neighbor.c">
-      <Filter>spell</Filter>
+    <ClCompile Include="..\..\src\spell-kind\spells-floor.c">
+      <Filter>spell-kind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spell\spells-specific-bolt.c">
-      <Filter>spell</Filter>
+    <ClCompile Include="..\..\src\spell-kind\spells-genocide.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-launcher.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-lite.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-neighbor.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-pet.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-sight.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-specific-bolt.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-teleport.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-world.c">
+      <Filter>spell-kind</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1747,9 +1747,6 @@
     <ClInclude Include="..\..\src\spell\spells-diceroll.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-floor.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\spell\spells-object.h">
       <Filter>spell</Filter>
     </ClInclude>
@@ -1759,9 +1756,6 @@
     <ClInclude Include="..\..\src\spell\spells-summon.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-world.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\locele\japanese.h">
       <Filter>locale</Filter>
     </ClInclude>
@@ -1873,9 +1867,6 @@
     <ClInclude Include="..\..\src\core\sort.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-detection.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mind\racial-samurai.h">
       <Filter>mind</Filter>
     </ClInclude>
@@ -2443,21 +2434,6 @@
     <ClInclude Include="..\..\src\mind\racial-ninja.h">
       <Filter>mind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-teleport.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-launcher.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-sight.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-genocide.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-lite.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mind\racial-draconian.h">
       <Filter>mind</Filter>
     </ClInclude>
@@ -2470,17 +2446,41 @@
     <ClInclude Include="..\..\src\spell\spells-staff-only.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-pet.h">
-      <Filter>spell</Filter>
+    <ClInclude Include="..\..\src\spell-kind\spells-beam.h">
+      <Filter>spell-kind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-beam.h">
-      <Filter>spell</Filter>
+    <ClInclude Include="..\..\src\spell-kind\spells-detection.h">
+      <Filter>spell-kind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-neighbor.h">
-      <Filter>spell</Filter>
+    <ClInclude Include="..\..\src\spell-kind\spells-floor.h">
+      <Filter>spell-kind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spell\spells-specific-bolt.h">
-      <Filter>spell</Filter>
+    <ClInclude Include="..\..\src\spell-kind\spells-genocide.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-launcher.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-lite.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-neighbor.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-pet.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-sight.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-specific-bolt.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-teleport.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-world.h">
+      <Filter>spell-kind</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -2611,6 +2611,9 @@
     <Filter Include="specific-object">
       <UniqueIdentifier>{d12d97f4-76e6-4f8e-9f45-9905cf3863f9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="spell-kind">
+      <UniqueIdentifier>{2ed79129-9b65-4718-b9c4-ce4ef793c81f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 32dacc5..debd131 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -390,29 +390,30 @@ hengband_SOURCES = \
        spell/range-calc.c spell/range-calc.h \
        spell/spells2.c spell/spells2.h \
        spell/spells3.c spell/spells3.h \
-       spell/spells-beam.c spell/spells-beam.h \
        spell/spells-describer.c spell/spells-describer.h \
-       spell/spells-detection.c spell/spells-detection.h \
        spell/spells-diceroll.c spell/spells-diceroll.h \
        spell/spells-execution.c spell/spells-execution.h \
-       spell/spells-floor.c spell/spells-floor.h \
-       spell/spells-genocide.c spell/spells-genocide.h \
        spell/spells-hex.c spell/spells-hex.h \
-       spell/spells-launcher.c spell/spells-launcher.h \
-       spell/spells-lite.c spell/spells-lite.h \
-       spell/spells-neighbor.c spell/spells-neighbor.h \
        spell/spells-object.c spell/spells-object.h \
-       spell/spells-pet.c spell/spells-pet.h \
-       spell/spells-sight.c spell/spells-sight.h \
-       spell/spells-specific-bolt.c spell/spells-specific-bolt.h \
        spell/spells-summon.c spell/spells-summon.h \
        spell/spells-staff-only.c spell/spells-staff-only.h \
        spell/spells-status.c spell/spells-status.h \
-       spell/spells-teleport.c spell/spells-teleport.h \
        spell/spells-util.h spell/spells-type.h \
-       spell/spells-world.c spell/spells-world.h \
        spell/technic-info-table.c spell/technic-info-table.h \
        \
+       spell-kind/spells-beam.c spell-kind/spells-beam.h \
+       spell-kind/spells-detection.c spell-kind/spells-detection.h \
+       spell-kind/spells-floor.c spell-kind/spells-floor.h \
+       spell-kind/spells-genocide.c spell-kind/spells-genocide.h \
+       spell-kind/spells-launcher.c spell-kind/spells-launcher.h \
+       spell-kind/spells-lite.c spell-kind/spells-lite.h \
+       spell-kind/spells-neighbor.c spell-kind/spells-neighbor.h \
+       spell-kind/spells-pet.c spell-kind/spells-pet.h \
+       spell-kind/spells-sight.c spell-kind/spells-sight.h \
+       spell-kind/spells-specific-bolt.c spell-kind/spells-specific-bolt.h \
+       spell-kind/spells-teleport.c spell-kind/spells-teleport.h \
+       spell-kind/spells-world.c spell-kind/spells-world.h \
+       \
        store/store.c store/store.h \
        store/black-market.c store/black-market.h \
        store/rumor.c store/rumor.h \

diff --git a/src/spell/spells-beam.c b/src/spell-kind/spells-beam.c
similarity index 100%
rename from src/spell/spells-beam.c
rename to src/spell-kind/spells-beam.c

diff --git a/src/spell/spells-beam.h b/src/spell-kind/spells-beam.h
similarity index 100%
rename from src/spell/spells-beam.h
rename to src/spell-kind/spells-beam.h

diff --git a/src/spell/spells-detection.c b/src/spell-kind/spells-detection.c
similarity index 100%
rename from src/spell/spells-detection.c
rename to src/spell-kind/spells-detection.c

diff --git a/src/spell/spells-detection.h b/src/spell-kind/spells-detection.h
similarity index 100%
rename from src/spell/spells-detection.h
rename to src/spell-kind/spells-detection.h

diff --git a/src/spell/spells-floor.c b/src/spell-kind/spells-floor.c
similarity index 100%
rename from src/spell/spells-floor.c
rename to src/spell-kind/spells-floor.c

diff --git a/src/spell/spells-floor.h b/src/spell-kind/spells-floor.h
similarity index 100%
rename from src/spell/spells-floor.h
rename to src/spell-kind/spells-floor.h

diff --git a/src/spell/spells-genocide.c b/src/spell-kind/spells-genocide.c
similarity index 100%
rename from src/spell/spells-genocide.c
rename to src/spell-kind/spells-genocide.c

diff --git a/src/spell/spells-genocide.h b/src/spell-kind/spells-genocide.h
similarity index 100%
rename from src/spell/spells-genocide.h
rename to src/spell-kind/spells-genocide.h

diff --git a/src/spell/spells-launcher.c b/src/spell-kind/spells-launcher.c
similarity index 100%
rename from src/spell/spells-launcher.c
rename to src/spell-kind/spells-launcher.c

diff --git a/src/spell/spells-launcher.h b/src/spell-kind/spells-launcher.h
similarity index 100%
rename from src/spell/spells-launcher.h
rename to src/spell-kind/spells-launcher.h

diff --git a/src/spell/spells-lite.c b/src/spell-kind/spells-lite.c
similarity index 100%
rename from src/spell/spells-lite.c
rename to src/spell-kind/spells-lite.c

diff --git a/src/spell/spells-lite.h b/src/spell-kind/spells-lite.h
similarity index 100%
rename from src/spell/spells-lite.h
rename to src/spell-kind/spells-lite.h

diff --git a/src/spell/spells-neighbor.c b/src/spell-kind/spells-neighbor.c
similarity index 100%
rename from src/spell/spells-neighbor.c
rename to src/spell-kind/spells-neighbor.c

diff --git a/src/spell/spells-neighbor.h b/src/spell-kind/spells-neighbor.h
similarity index 100%
rename from src/spell/spells-neighbor.h
rename to src/spell-kind/spells-neighbor.h

diff --git a/src/spell/spells-pet.c b/src/spell-kind/spells-pet.c
similarity index 100%
rename from src/spell/spells-pet.c
rename to src/spell-kind/spells-pet.c

diff --git a/src/spell/spells-pet.h b/src/spell-kind/spells-pet.h
similarity index 100%
rename from src/spell/spells-pet.h
rename to src/spell-kind/spells-pet.h

diff --git a/src/spell/spells-sight.c b/src/spell-kind/spells-sight.c
similarity index 100%
rename from src/spell/spells-sight.c
rename to src/spell-kind/spells-sight.c

diff --git a/src/spell/spells-sight.h b/src/spell-kind/spells-sight.h
similarity index 100%
rename from src/spell/spells-sight.h
rename to src/spell-kind/spells-sight.h

diff --git a/src/spell/spells-specific-bolt.c b/src/spell-kind/spells-specific-bolt.c
similarity index 100%
rename from src/spell/spells-specific-bolt.c
rename to src/spell-kind/spells-specific-bolt.c

diff --git a/src/spell/spells-specific-bolt.h b/src/spell-kind/spells-specific-bolt.h
similarity index 100%
rename from src/spell/spells-specific-bolt.h
rename to src/spell-kind/spells-specific-bolt.h

diff --git a/src/spell/spells-teleport.c b/src/spell-kind/spells-teleport.c
similarity index 100%
rename from src/spell/spells-teleport.c
rename to src/spell-kind/spells-teleport.c

diff --git a/src/spell/spells-teleport.h b/src/spell-kind/spells-teleport.h
similarity index 100%
rename from src/spell/spells-teleport.h
rename to src/spell-kind/spells-teleport.h

diff --git a/src/spell/spells-world.c b/src/spell-kind/spells-world.c
similarity index 100%
rename from src/spell/spells-world.c
rename to src/spell-kind/spells-world.c

diff --git a/src/spell/spells-world.h b/src/spell-kind/spells-world.h
similarity index 100%
rename from src/spell/spells-world.h
rename to src/spell-kind/spells-world.h