[Refactor] #38862 Moved spells-* to spell/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index b8dab64..16fa213 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -453,10 +453,10 @@
     <ClCompile Include="..\..\src\mind.c" />\r
     <ClCompile Include="..\..\src\monster\monster1.c" />\r
     <ClCompile Include="..\..\src\monster\monster2.c" />\r
-    <ClCompile Include="..\..\src\mspells1.c" />\r
-    <ClCompile Include="..\..\src\mspells2.c" />\r
-    <ClCompile Include="..\..\src\mspells3.c" />\r
-    <ClCompile Include="..\..\src\mspells4.c" />\r
+    <ClCompile Include="..\..\src\spell\mspells1.c" />\r
+    <ClCompile Include="..\..\src\spell\mspells2.c" />\r
+    <ClCompile Include="..\..\src\spell\mspells3.c" />\r
+    <ClCompile Include="..\..\src\spell\mspells4.c" />\r
     <ClCompile Include="..\..\src\mutation\mutation.c" />\r
     <ClCompile Include="..\..\src\object\object1.c" />\r
     <ClCompile Include="..\..\src\object\object2.c" />\r
@@ -485,12 +485,12 @@
     <ClCompile Include="..\..\src\io\signal-handlers.c" />\r
     <ClCompile Include="..\..\src\snipe.c" />\r
     <ClCompile Include="..\..\src\sort.c" />\r
-    <ClCompile Include="..\..\src\spells-diceroll.c" />\r
-    <ClCompile Include="..\..\src\spells-floor.c" />\r
-    <ClCompile Include="..\..\src\spells-object.c" />\r
-    <ClCompile Include="..\..\src\spells-status.c" />\r
-    <ClCompile Include="..\..\src\spells-summon.c" />\r
-    <ClCompile Include="..\..\src\spells-world.c" />\r
+    <ClCompile Include="..\..\src\spell\spells-diceroll.c" />\r
+    <ClCompile Include="..\..\src\spell\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\spells1.c" />\r
     <ClCompile Include="..\..\src\spell\spells2.c" />\r
     <ClCompile Include="..\..\src\spell\spells3.c" />\r
@@ -650,7 +650,7 @@
     <ClInclude Include="..\..\src\load.h" />\r
     <ClInclude Include="..\..\src\mind.h" />\r
     <ClInclude Include="..\..\src\monster\monster-process.h" />\r
-    <ClInclude Include="..\..\src\monster-spell.h" />\r
+    <ClInclude Include="..\..\src\spell\monster-spell.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
     <ClInclude Include="..\..\src\monster\monster.h" />\r
     <ClInclude Include="..\..\src\monster\monsterrace-hook.h" />\r
@@ -706,13 +706,13 @@
     <ClInclude Include="..\..\src\selfinfo.h" />\r
     <ClInclude Include="..\..\src\snipe.h" />\r
     <ClInclude Include="..\..\src\sort.h" />\r
-    <ClInclude Include="..\..\src\spells-diceroll.h" />\r
-    <ClInclude Include="..\..\src\spells-floor.h" />\r
-    <ClInclude Include="..\..\src\spells-object.h" />\r
-    <ClInclude Include="..\..\src\spells-status.h" />\r
-    <ClInclude Include="..\..\src\spells-summon.h" />\r
+    <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r
+    <ClInclude Include="..\..\src\spell\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\spells-world.h" />\r
+    <ClInclude Include="..\..\src\spell\spells-world.h" />\r
     <ClInclude Include="..\..\src\spell\spells1.h" />\r
     <ClInclude Include="..\..\src\market\store.h" />\r
     <ClInclude Include="..\..\src\targeting.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 9ea47b9..d608666 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -6,24 +6,6 @@
     <ClCompile Include="..\..\src\z-form.c" />
     <ClCompile Include="..\..\src\z-term.c" />
     <ClCompile Include="..\..\src\warning.c" />
-    <ClCompile Include="..\..\src\spells-diceroll.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spells-floor.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spells-object.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spells-status.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spells-summon.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\spells-world.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\patron.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -46,18 +28,6 @@
     <ClCompile Include="..\..\src\chuukei.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\mspells4.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mspells1.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mspells2.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mspells3.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\geometry.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -829,6 +799,36 @@
     <ClCompile Include="..\..\src\system\system-variables.c">
       <Filter>system</Filter>
     </ClCompile>
+    <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>
+    <ClCompile Include="..\..\src\spell\spells-status.c">
+      <Filter>spell</Filter>
+    </ClCompile>
+    <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\spell\mspells1.c">
+      <Filter>spell</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell\mspells2.c">
+      <Filter>spell</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell\mspells3.c">
+      <Filter>spell</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\spell\mspells4.c">
+      <Filter>spell</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -837,24 +837,6 @@
     <ClInclude Include="..\..\src\z-form.h" />
     <ClInclude Include="..\..\src\z-term.h" />
     <ClInclude Include="..\..\src\warning.h" />
-    <ClInclude Include="..\..\src\spells-diceroll.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spells-floor.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spells-object.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spells-status.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spells-summon.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\spells-world.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\patron.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -876,9 +858,6 @@
     <ClInclude Include="..\..\src\chuukei.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster-spell.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\geometry.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -1701,6 +1680,27 @@
     <ClInclude Include="..\..\src\system\system-variables.h">
       <Filter>system</Filter>
     </ClInclude>
+    <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>
+    <ClInclude Include="..\..\src\spell\spells-status.h">
+      <Filter>spell</Filter>
+    </ClInclude>
+    <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\spell\monster-spell.h">
+      <Filter>spell</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/artifact.c b/src/artifact.c
index ee3d463..c73d9cc 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -26,7 +26,7 @@
 #include "object/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "spells-object.h"
+#include "spell/spells-object.h"
 #include "files.h"
 #include "grid.h"
 #include "monster/monster.h"

diff --git a/src/birth/birth.c b/src/birth/birth.c
index d071f8a..a7efdf2 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -54,7 +54,7 @@
 #include "realm/realm.h"
 #include "save.h"
 #include "spell/spells-util.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
 #include "view/display-player.h" // 暫定。後で消す.
 #include "wild.h"

diff --git a/src/chest.c b/src/chest.c
index 292633f..5f4ee59 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -3,7 +3,7 @@
 #include "main/sound-definitions-table.h"
 
 #include "spell/spells-type.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "floor/floor.h"
 #include "trap.h"
 #include "player/player-status.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index b3eb141..23579d4 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -16,10 +16,10 @@
 #include "sort.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-object.h"
-#include "spells-floor.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-floor.h"
 #include "player/player-effects.h"
 #include "realm/realm-hex.h"
 #include "player/player-damage.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index 14d653e..242b938 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -14,7 +14,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "avatar.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "realm/realm-hex.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 3f3af39..7ed5692 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -17,10 +17,10 @@
 
 #include "floor/floor.h"
 #include "grid.h"
-#include "spells-summon.h"
-#include "spells-status.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-process.h"
 #include "cmd-spell.h"
 #include "player/player-status.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 0b2e22c..ef016a9 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -17,14 +17,14 @@
 #include "avatar.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "player/player-damage.h"
 #include "player/mimic-info-table.h"
 #include "player-inventory.h"
 #include "realm/realm-hex.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "object/object-broken.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 8857fb0..ae664c0 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -22,10 +22,10 @@
 #include "rumor.h"
 #include "realm/realm-hex.h"
 
-#include "spells-object.h"
-#include "spells-floor.h"
-#include "spells-summon.h"
-#include "spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
 
 #include "cmd/cmd-basic.h"
 #include "core/show-file.h"

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index b6d2f54..86169c6 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -18,7 +18,7 @@
 #include "spell/technic-info-table.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "realm/realm-hex.h"
 #include "mind.h"
 #include "avatar.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 644d171..3f1cbed 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -3,7 +3,7 @@
 #include "main/sound-definitions-table.h"
 
 #include "player/player-race.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
@@ -11,8 +11,8 @@
 #include "player-inventory.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 0604d3b..18ef5b2 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -10,8 +10,8 @@
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "spell/spells-type.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"
 #include "targeting.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index def5e67..274d129 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -4,7 +4,7 @@
 
 #include "avatar.h"
 #include "spell/spells-type.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 4260e36..71870dc 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -22,7 +22,7 @@
 #include "melee.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "avatar.h"
 #include "realm/realm-hex.h"
 #include "realm/realm-song.h"
@@ -45,7 +45,7 @@
 #include "player/player-personality.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 3334bab..a044981 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -6,7 +6,7 @@
 
 #include "monster/monster.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "player/player-status.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 7b82f77..d029f4d 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -39,7 +39,7 @@
 #include "player/player-skill.h"
 #include "player/process-name.h"
 #include "spell/technic-info-table.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "view/display-player.h"
 #include "wild.h"
 #include "world/world.h"

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index f2b0f5a..b2285bc 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -2,7 +2,7 @@
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-charm.h"
 #include "avatar.h"
-#include "spells-diceroll.h"
+#include "spell/spells-diceroll.h"
 #include "monster/monsterrace-hook.h"
 
 static void effect_monster_charm_resist(player_type *caster_ptr, effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index 359abd6..b2b2dc1 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -2,7 +2,7 @@
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-domination.h"
 #include "player/player-effects.h"
-#include "spells-diceroll.h"
+#include "spell/spells-diceroll.h"
 #include "monster/monster-status.h"
 #include "effect/spells-effect-util.h"
 #include "cmd/cmd-pet.h" // 暫定、後で消すかも.

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index dd2596e..af9896c 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-spirit.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-status.h"
 #include "player/player-effects.h"
 

diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c
index af30954..79c6354 100644 (file)
--- a/src/effect/effect-player-curse.c
+++ b/src/effect/effect-player-curse.c
@@ -3,7 +3,7 @@
 #include "effect/effect-player-curse.h"
 #include "player/player-damage.h"
 #include "world/world.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "object/object-curse.h"
 #include "player/player-effects.h"
 

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index dc4af21..10c04b2 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -7,8 +7,8 @@
 #include "artifact.h"
 #include "player/player-effects.h"
 #include "mutation/mutation.h"
-#include "monster-spell.h"
-#include "spells-status.h"
+#include "spell/monster-spell.h"
+#include "spell/spells-status.h"
 #include "spell/spells3.h"
 
 // 毒を除く4元素.

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index ad596b0..839e6b6 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-spirit.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "world/world.h"

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index ae8d977..7c1db58 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -5,7 +5,7 @@
 #include "effect/effect-player-oldies.h"
 #include "effect/effect-player-resist-hurt.h"
 #include "effect/effect-player-spirit.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "object/object-broken.h"
 #include "object/object-curse.h"
 #include "player/player-damage.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 4b815c6..0230215 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -28,7 +28,7 @@
 #include "monster/monster.h"
 #include "quest.h"
 #include "wild.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "cmd-pet.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 22e1be5..50b7258 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -29,7 +29,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "spell/spells1.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "room/rooms.h"
 
 

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index 4273aa3..cd6e67e 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -4,7 +4,7 @@
 #include "io/write-diary.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "player/player-damage.h"
 #include "realm/realm-song.h"
 #include "spell/spells3.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 50f6c0f..e4fb916 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "inventory/inventory-curse.h"
 #include "object/object-flavor.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "player/player-damage.h"
 #include "player/player-move.h"
 #include "spell/spells2.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 2011b33..7ab87d4 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -20,9 +20,9 @@
 #include "market/store.h" // do_cmd_store() がある。後で移設する.
 #include "quest.h" // do_cmd_quest() がある。後で移設する.
 #include "wild.h"
-#include "spells-object.h"
+#include "spell/spells-object.h"
 #include "mind.h" // do_cmd_mind_browse() がある。後で移設する.
-#include "monster-spell.h" // do_cmd_cast_learned() がある。後で移設する.
+#include "spell/monster-spell.h" // do_cmd_cast_learned() がある。後で移設する.
 #include "racial.h" // do_cmd_racial_power() がある。ファイル名変更？.
 #include "view/display-main-window.h"
 #include "knowledge/knowledge-autopick.h"

diff --git a/src/io/special-class-dump.c b/src/io/special-class-dump.c
index 5b7a82c..6c451a9 100644 (file)
--- a/src/io/special-class-dump.c
+++ b/src/io/special-class-dump.c
@@ -8,7 +8,7 @@
 #include "special-class-dump.h"
 #include "cmd/cmd-magiceat.h"
 #include "object/object-kind.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 
 typedef struct {
        BIT_FLAGS f4;

diff --git a/src/load.c b/src/load.c
index 6c0a033..ca4302a 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -60,7 +60,7 @@
 #include "market/store.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "object/object-hook.h"
 #include "wild.h"
 #include "patron.h"

diff --git a/src/market/building.c b/src/market/building.c
index 2d2d748..1367f1c 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -46,8 +46,8 @@
 #include "artifact.h"
 #include "cmd-spell.h"
 #include "spell/spells3.h"
-#include "spells-object.h"
-#include "spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-status.h"
 #include "realm/realm-hex.h"
 #include "dungeon/dungeon-file.h"
 

diff --git a/src/mind.c b/src/mind.c
index c55c794..cf5dd4e 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -23,14 +23,14 @@
 
 #include "effect/effect-characteristics.h"
 #include "melee.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "avatar.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "cmd-spell.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "feature.h"
 #include "grid.h"
 #include "cmd-basic.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 07eb8f4..c28e388 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -27,14 +27,14 @@
 #include "cmd/cmd-pet.h"
 #include "creature.h"
 #include "melee.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "avatar.h"
 #include "realm/realm-hex.h"
 #include "feature.h"
 #include "grid.h"
 #include "player/player-move.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-process.h"
 
 void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon);

diff --git a/src/monster/monster-safety-hiding.c b/src/monster/monster-safety-hiding.c
index aec36bb..0445137 100644 (file)
--- a/src/monster/monster-safety-hiding.c
+++ b/src/monster/monster-safety-hiding.c
@@ -6,7 +6,7 @@
 
 #include "monster/monster-safety-hiding.h"
 #include "monster/monster-dist-offsets.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 
  /*!
   * @brief モンスターが逃げ込める地点を走査する

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 50fa898..93fd018 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -13,10 +13,10 @@
 #include "grid.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-process.h"
 #include "spell/spells2.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "monster/monsterrace-hook.h"
 #include "object/object-curse.h"
 #include "artifact.h"

diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c
index 72dbcee..980cbbb 100644 (file)
--- a/src/monster/monster-sweep-grid.c
+++ b/src/monster/monster-sweep-grid.c
@@ -6,7 +6,7 @@
 
 #include "monster/monster-sweep-grid.h"
 #include "monster/monster-safety-hiding.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 
  /*!
   * @brief モンスターがプレイヤーから逃走するかどうかを返す /

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 4e50dcf..776c2ec 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -23,9 +23,9 @@
 #include "object/object-kind-hook.h"
 #include "player/player-personality.h"
 #include "monster/monster.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monsterrace-hook.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "patron.h"
 #include "quest.h"
 #include "artifact.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 5b30087..e45d03a 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -25,7 +25,7 @@
 #include "monster/monster-status.h"
 #include "monster/monster.h"
 #include "spell/spells-type.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "quest.h"
 #include "grid.h"
 #include "player/player-move.h"
@@ -35,7 +35,7 @@
 #include "player/player-personality.h"
 #include "wild.h"
 #include "warning.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "files.h"
 #include "view/display-main-window.h"
 #include "world/world.h"

diff --git a/src/monster/monsterrace-hook.c b/src/monster/monsterrace-hook.c
index 25d8651..0c0d2f0 100644 (file)
--- a/src/monster/monsterrace-hook.c
+++ b/src/monster/monsterrace-hook.c
@@ -3,7 +3,7 @@
 
 #include "monster/monsterrace-hook.h"
 #include "monster/monster.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
 #include "monster/monsterrace.h"

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index f9c2284..278f2da 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "quantum-effect.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "spell/spells3.h"
 
 /*!

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 856ed3a..d23cc81 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "mutation/mutation-processor.h"
 #include "spell/spells-type.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "market/store-util.h"
 #include "market/store-owners.h"
 #include "player/player-damage.h"
@@ -9,7 +9,7 @@
 #include "player/player-effects.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "targeting.h"
 #include "market/store.h"
 #include "object/object-hook.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index dbbccba..da04901 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -21,15 +21,15 @@
 #include "mutation/mutation.h"
 
 #include "selfinfo.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-personality.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"
 #include "files.h"

diff --git a/src/patron.c b/src/patron.c
index 4b175f8..067733b 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -19,10 +19,10 @@
 #include "player/player-damage.h"
 
 #include "spell/spells-type.h"
-#include "spells-summon.h"
-#include "spells-object.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-object.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "floor/floor.h"
 #include "spell/spells2.h"
 

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index b3116c2..bcd84ba 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -24,7 +24,7 @@
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-race.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "world/world.h"
 #include "view/display-main-window.h"
 #include "quest.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 759031c..53a602b 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -28,13 +28,13 @@
 #include "mutation/mutation.h"
 #include "quest.h"
 #include "avatar.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "realm/realm-song.h"
 #include "realm/realm-hex.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"
 #include "wild.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
 #include "player/player-move.h"
@@ -47,7 +47,7 @@
 #include "monster/monster-status.h"
 #include "snipe.h"
 #include "files.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "autopick/autopick-reader-writer.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index f33edef..10fc75e 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -161,11 +161,11 @@
 #include "player/player-class.h"
 #include "player-inventory.h"
 #include "player/player-personality.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "feature.h"
 #include "warning.h"
 #include "monster/monster.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index fa39255..b91b181 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -20,7 +20,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "spell/technic-info-table.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "object/object.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"

diff --git a/src/racial.c b/src/racial.c
index 40ec421..79122fc 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -27,9 +27,9 @@
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "player/player-damage.h"
-#include "spells-status.h"
-#include "spells-object.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-floor.h"
 #include "cmd-spell.h"
 #include "realm/realm-hex.h"
 #include "targeting.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 0cabde6..de30ccd 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -6,11 +6,11 @@
 
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-floor.h"
-#include "spells-object.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-diceroll.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-object.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-diceroll.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "targeting.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 93342f6..581628c 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -4,11 +4,11 @@
 #include "cmd-spell.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-floor.h"
-#include "spells-object.h"
-#include "spells-diceroll.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-object.h"
+#include "spell/spells-diceroll.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "realm/realm-chaos.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index 8fac092..343b57f 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -4,9 +4,9 @@
 #include "cmd-spell.h"
 #include "selfinfo.h"
 #include "spell/spells1.h"
-#include "spells-object.h"
-#include "spells-summon.h"
-#include "spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
 #include "mutation/mutation.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 3b4967f..26b9b43 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -5,11 +5,11 @@
 #include "cmd-spell.h"
 #include "effect/effect-characteristics.h"
 #include "spell/spells-type.h"
-#include "spells-object.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-floor.h"
-#include "spells-diceroll.h"
+#include "spell/spells-object.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-diceroll.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "targeting.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 652059d..2ec2dd1 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -4,11 +4,11 @@
 #include "player/player-class.h"
 #include "cmd-spell.h"
 #include "spell/spells-type.h"
-#include "spells-summon.h"
-#include "spells-floor.h"
-#include "spells-status.h"
-#include "spells-object.h"
-#include "spells-diceroll.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-diceroll.h"
 #include "player/player-effects.h"
 #include "player/player-race.h"
 #include "player/player-damage.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index e7a0e5e..7663dd2 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -1,10 +1,10 @@
 #include "system/angband.h"
 #include "cmd-spell.h"
 #include "spell/spells-type.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-object.h"
-#include "spells-diceroll.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-diceroll.h"
 #include "avatar.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 4651bcb..3ea8eec 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -24,7 +24,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-curse.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "spell/technic-info-table.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 90edb24..0225912 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -19,7 +19,7 @@
 #include "grid.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "world/world.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-util.h"

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index e9dd73d..b2a7e30 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "cmd-spell.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "player/player-status.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 5a11c06..e6c9a68 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -2,12 +2,12 @@
 #include "util.h"
 
 #include "cmd-spell.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-object.h"
-#include "spells-diceroll.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
+#include "spell/spells-diceroll.h"
 #include "avatar.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "player/player-race.h"
 #include "player/player-effects.h"
 #include "player/player-damage.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index a9382aa..18cbd35 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -3,8 +3,8 @@
 
 #include "cmd-spell.h"
 #include "spell/spells-type.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "targeting.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 2b1e116..e7fcd55 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -6,8 +6,8 @@
 #include "avatar.h"
 
 #include "spell/spells-type.h"
-#include "spells-status.h"
-#include "spells-floor.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
 #include "player/player-effects.h"
 #include "targeting.h"
 #include "realm/realm-sorcery.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 3c6da86..741a5ce 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -3,9 +3,9 @@
 
 #include "cmd-spell.h"
 #include "mutation/mutation.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-object.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-object.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "targeting.h"

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

diff --git a/src/mspells1.c b/src/spell/mspells1.c
similarity index 99%
rename from src/mspells1.c
rename to src/spell/mspells1.c
index b00c4ed..fa7ed39 100644 (file)
--- a/src/mspells1.c
+++ b/src/spell/mspells1.c
@@ -50,7 +50,7 @@
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "monster/monster.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "spell/spells-type.h"
 #include "world/world.h"
 #include "realm/realm-song.h"

diff --git a/src/mspells2.c b/src/spell/mspells2.c
similarity index 99%
rename from src/mspells2.c
rename to src/spell/mspells2.c
index abed7a2..9717274 100644 (file)
--- a/src/mspells2.c
+++ b/src/spell/mspells2.c
@@ -24,7 +24,7 @@
 #include "player/player-class.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "spell/spells-type.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"

diff --git a/src/mspells3.c b/src/spell/mspells3.c
similarity index 99%
rename from src/mspells3.c
rename to src/spell/mspells3.c
index 34e32c9..80025af 100644 (file)
--- a/src/mspells3.c
+++ b/src/spell/mspells3.c
@@ -22,7 +22,7 @@
 #include "spells-status.h"
 #include "cmd-spell.h"
 #include "player/player-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-status.h"
 #include "spell/spells-type.h"
 #include "cmd-basic.h"

diff --git a/src/mspells4.c b/src/spell/mspells4.c
similarity index 99%
rename from src/mspells4.c
rename to src/spell/mspells4.c
index b5941d5..6316636 100644 (file)
--- a/src/mspells4.c
+++ b/src/spell/mspells4.c
@@ -19,7 +19,7 @@
 #include "player/player-damage.h"
 #include "realm/realm-hex.h"
 #include "player/player-move.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "monster/monster-status.h"
 #include "spell/spells-type.h"
 #include "melee.h"

diff --git a/src/spells-diceroll.c b/src/spell/spells-diceroll.c
similarity index 98%
rename from src/spells-diceroll.c
rename to src/spell/spells-diceroll.c
index f563edf..43573c6 100644 (file)
--- a/src/spells-diceroll.c
+++ b/src/spell/spells-diceroll.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 
-#include "spells-diceroll.h"
+#include "spell/spells-diceroll.h"
 
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"

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

diff --git a/src/spells-floor.c b/src/spell/spells-floor.c
similarity index 99%
rename from src/spells-floor.c
rename to src/spell/spells-floor.c
index f21bd82..b40d53e 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -25,7 +25,7 @@
 #include "monster/monster-status.h"
 
 #include "spell/spells3.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 
 /*
  * Light up the dungeon using "clairvoyance"

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

diff --git a/src/spells-object.c b/src/spell/spells-object.c
similarity index 99%
rename from src/spells-object.c
rename to src/spell/spells-object.c
index f4af8f9..7af3f30 100644 (file)
--- a/src/spells-object.c
+++ b/src/spell/spells-object.c
@@ -7,7 +7,7 @@
 #include "floor/floor.h"
 #include "grid.h"
 #include "spell/spells3.h"
-#include "spells-object.h"
+#include "spell/spells-object.h"
 #include "object/object-boost.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"

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

diff --git a/src/spells-status.c b/src/spell/spells-status.c
similarity index 99%
rename from src/spells-status.c
rename to src/spell/spells-status.c
index 1ff0a0e..dfe0ed7 100644 (file)
--- a/src/spells-status.c
+++ b/src/spell/spells-status.c
@@ -8,7 +8,7 @@
 #include "object/object-flavor.h"
 #include "player/player-status.h"
 #include "player/player-class.h"
-#include "spells-status.h"
+#include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "monster/monster.h"
 #include "cmd-spell.h"

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

diff --git a/src/spells-summon.c b/src/spell/spells-summon.c
similarity index 99%
rename from src/spells-summon.c
rename to src/spell/spells-summon.c
index ec11267..4e5ef92 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "player-inventory.h"
 #include "monster/monster-status.h"
 #include "floor/floor.h"

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

diff --git a/src/spells-world.c b/src/spell/spells-world.c
similarity index 95%
rename from src/spells-world.c
rename to src/spell/spells-world.c
index 8f8792a..401cde4 100644 (file)
--- a/src/spells-world.c
+++ b/src/spell/spells-world.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "spell/spells-world.h"
 #include "util.h"
 #include "world/world.h"
 

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

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index fa62043..146c464 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -31,14 +31,14 @@
 #include "world/world.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "mutation/mutation.h"
 #include "quest.h"
 #include "avatar.h"
 
-#include "spells-status.h"
-#include "spells-floor.h"
-#include "spells-diceroll.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
+#include "spell/spells-diceroll.h"
 #include "realm/realm-hex.h"
 #include "autopick/autopick.h"
 #include "object/object-flavor.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 0df5309..88fa966 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -33,19 +33,19 @@
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player-inventory.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "spells-floor.h"
+#include "spell/spells-floor.h"
 #include "spell/technic-info-table.h"
 #include "grid.h"
 #include "market/building-util.h"
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-save.h"
 #include "cmd/cmd-spell.h"

diff --git a/src/targeting.c b/src/targeting.c
index 06c8217..c0b68d2 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -26,7 +26,7 @@
 #include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "sort.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "grid.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"

diff --git a/src/trap.c b/src/trap.c
index 34febfc..3157f95 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -11,7 +11,7 @@
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"
-#include "spells-summon.h"
+#include "spell/spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
 #include "feature.h"

diff --git a/src/warning.c b/src/warning.c
index 4fbb339..c1bf5ac 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -9,7 +9,7 @@
 #include "warning.h"
 #include "player/player-status.h"
 #include "monster/monster.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "spell/spells-type.h"
 #include "object/object-flavor.h"
 #include "dungeon/dungeon.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index cd2629a..9712bd9 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -37,11 +37,11 @@
 #include "player-inventory.h"
 
 #include "spell/spells-util.h"
-#include "spells-object.h"
-#include "spells-summon.h"
-#include "spells-status.h"
-#include "spells-world.h"
-#include "spells-floor.h"
+#include "spell/spells-object.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-status.h"
+#include "spell/spells-world.h"
+#include "spell/spells-floor.h"
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
@@ -52,7 +52,7 @@
 #include "grid.h"
 #include "dungeon/dungeon-file.h"
 #include "files.h"
-#include "monster-spell.h"
+#include "spell/monster-spell.h"
 #include "market/building.h"
 #include "object/object-kind.h"
 #include "targeting.h"