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

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index 094c575..2215e8d 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -23,13 +23,13 @@
 #include "mspell/mspell-type.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "util/util.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 720b9a5..b6b75b6 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -29,7 +29,7 @@
 #include "spell/spells-describer.h"
 #include "spell/spells-execution.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-util.h"
 #include "spell/spells2.h"

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index df1f4cf..0beea15 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -49,7 +49,7 @@
 #include "player/player-personalities-table.h"
 #include "player/player-status.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 #include "util/util.h"
 #include "world/world.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index af4aac1..b51e463 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -28,20 +28,20 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "spell/process-effect.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index 57c1d26..2fb05f2 100644 (file)
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -28,8 +28,8 @@
 #include "player/player-status.h"
 #include "player/selfinfo.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-hex.h"
 #include "spell/spells-status.h"
 #include "spell/spells3.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 8c20cdb..f944f05 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -24,18 +24,18 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "store/rumor.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index c0f8f40..5b1686e 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -17,16 +17,16 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "player/player-status.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-staff-only.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 #include "util/util.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index a3ca17f..ca1b058 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -15,16 +15,16 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 28c6d96..d04a75b 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -15,13 +15,13 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "util/util.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 257b3fa..a6befc0 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -56,7 +56,7 @@
 #include "player/player-personalities-table.h"
 #include "player/player-status.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "system/system-variables.h"
 #include "term/gameterm.h"
 #include "view/display-main-window.h"

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index 7f92a4d..849cd67 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -14,7 +14,7 @@
 #include "object/object-mark-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 
 /*!

diff --git a/src/combat/aura-counterattack.c b/src/combat/aura-counterattack.c
index d1a40fa..a5eb985 100644 (file)
--- a/src/combat/aura-counterattack.c
+++ b/src/combat/aura-counterattack.c
@@ -12,7 +12,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 
 static void aura_fire_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)

diff --git a/src/combat/melee-switcher.c b/src/combat/melee-switcher.c
index f392c79..f22966a 100644 (file)
--- a/src/combat/melee-switcher.c
+++ b/src/combat/melee-switcher.c
@@ -8,7 +8,7 @@
 #include "combat/monster-attack-effect.h"
 #include "monster/monster-status.h"
 #include "player/player-move.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 
 void describe_melee_method(player_type *subject_ptr, mam_type *mam_ptr)
 {

diff --git a/src/combat/monster-attack-monster.c b/src/combat/monster-attack-monster.c
index 8bd8889..61cdb04 100644 (file)
--- a/src/combat/monster-attack-monster.c
+++ b/src/combat/monster-attack-monster.c
@@ -19,7 +19,7 @@
 #include "player/player-move.h"
 #include "spell/process-effect.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 
 /* todo モンスター共通なので、monster-attack-player.cでも使うはず */

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index 1c78d80..81dab8e 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -31,7 +31,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 
 static bool check_no_blow(player_type *target_ptr, monap_type *monap_ptr)

diff --git a/src/combat/monster-attack-switcher.c b/src/combat/monster-attack-switcher.c
index 0ef52b7..a5584fa 100644 (file)
--- a/src/combat/monster-attack-switcher.c
+++ b/src/combat/monster-attack-switcher.c
@@ -12,7 +12,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "spell/spells3.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 
 void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_ptr)
 {

diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index 6d6b755..98f8fc7 100644 (file)
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -28,7 +28,7 @@
 #include "player/player-damage.h"
 #include "player/player-skill.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-hex.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "world/world.h"

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 7dce5d8..b51fa0d 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -21,7 +21,7 @@
 #include "monster/monster-status.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
-#include "spell/spells-genocide.h"
+#include "spell-kind/spells-genocide.h"
 #include "spell/spells-type.h"
 
 gf_switch_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monster_type *em_ptr)

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 561c3fe..b6a7c3a 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -17,7 +17,7 @@
 #include "object/object-kind-hook.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "spells-effect-util.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 2b74da3..8c6a7a2 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -9,7 +9,7 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 #include "world/world.h"
 

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index c18fe19..748fd45 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -28,7 +28,7 @@
 #include "monster/monster.h"
 #include "dungeon/quest.h"
 #include "floor/wild.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "monster/monster-status.h"
 #include "object/object-hook.h"
 #include "pet/pet-util.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index c544ea7..39393a3 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -25,7 +25,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "room/rooms.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "util/util.h"
 
 /*!

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index 563f851..c737102 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -9,7 +9,7 @@
 #include "player/player-races-table.h"
 #include "realm/realm-song-numbers.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 
 /*!
  * @brief パターン終点到達時のテレポート処理を行う

diff --git a/src/grid/trap.c b/src/grid/trap.c
index f6593be..092397c 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -21,10 +21,10 @@
 #include "player/player-personalities-table.h"
 #include "player/player-status.h"
 #include "spell/process-effect.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "util/util.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 4760e24..022c200 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -13,7 +13,7 @@
 #include "player/player-move.h"
 #include "player/player-races-table.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells2.h"
 
 #define TRC_P_FLAG_MASK \

diff --git a/src/mind/mind.c b/src/mind/mind.c
index c5d4818..988ffed 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -38,14 +38,14 @@
 #include "player/player-status.h"
 #include "realm/realm-song-numbers.h"
 #include "spell/process-effect.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/mind/racial-balrog.c b/src/mind/racial-balrog.c
index 224250a..2d31dda 100644 (file)
--- a/src/mind/racial-balrog.c
+++ b/src/mind/racial-balrog.c
@@ -1,6 +1,6 @@
 #include "mind/racial-balrog.h"
 #include "io/targeting.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-type.h"
 
 bool demonic_breath(player_type *creature_ptr)

diff --git a/src/mind/racial-draconian.c b/src/mind/racial-draconian.c
index 7eb133e..79cd341 100644 (file)
--- a/src/mind/racial-draconian.c
+++ b/src/mind/racial-draconian.c
@@ -1,6 +1,6 @@
 #include "mind/racial-draconian.h"
 #include "io/targeting.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-type.h"
 
 static void decide_breath_kind(player_type *creature_ptr, int *breath_type, concptr *breath_type_description)

diff --git a/src/mind/racial-mirror-master.c b/src/mind/racial-mirror-master.c
index ec5264d..988dc82 100644 (file)
--- a/src/mind/racial-mirror-master.c
+++ b/src/mind/racial-mirror-master.c
@@ -7,7 +7,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"
 #include "spell/process-effect.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-type.h"
 #include "term/gameterm.h"
 #include "view/display-main-window.h"

diff --git a/src/mind/racial-ninja.c b/src/mind/racial-ninja.c
index 4a9358e..089e3a8 100644 (file)
--- a/src/mind/racial-ninja.c
+++ b/src/mind/racial-ninja.c
@@ -7,7 +7,7 @@
 #include "effect/spells-effect-util.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 
 /*!
  * @brief 変わり身処理

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 22daa92..2aacf4d 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -33,16 +33,16 @@
 #include "player/player-races-table.h"
 #include "player/player-status.h"
 #include "mind/racial-mirror-master.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index ead10db..c0099af 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -2,7 +2,7 @@
 #include "floor/floor.h"
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 
 /*!
  * @brief ユニークでない量子生物を消滅させる

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 4064c01..2cf0f51 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -15,10 +15,10 @@
 #include "player/player-personalities-table.h"
 #include "spell/process-effect.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 
 /*!

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index 013bc7c..e8a490b 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -14,7 +14,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 
 /*!

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 93458a5..d788462 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -5,7 +5,7 @@
 #include "mspell/mspell-util.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"
 

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index b8b9470..c882aed 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -58,7 +58,7 @@
 #include "spell/process-effect.h"
 #include "spell/range-calc.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "mspell/mspell-learn-checker.h"
 #include "mspell/assign-monster-spell.h"
 

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index ef9892b..4ac9b4f 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -23,7 +23,7 @@
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/range-calc.h"
 #include "dungeon/dungeon.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index 75bf273..8c3e217 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -28,11 +28,11 @@
 #include "player/player-effects.h"
 #include "io/targeting.h"
 #include "view/display-main-window.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-damage-calculator.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index b15f5d1..8d8c2d9 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -7,13 +7,13 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "store/store-owners.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index b296f6b..4f457c0 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -31,14 +31,14 @@
 #include "player/player-races-table.h"
 #include "player/player-status.h"
 #include "player/selfinfo.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/player/patron.c b/src/player/patron.c
index b49b61d..cba1e69 100644 (file)
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -15,11 +15,11 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "player/player-status.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 2e91159..5d765a2 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -57,7 +57,7 @@
 #include "player/player-status.h"
 #include "player/race-info-table.h"
 #include "realm/realm-song-numbers.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-hex.h"
 #include "spell/spells-status.h"
 #include "term/gameterm.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 8013a10..07ae526 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -172,7 +172,7 @@
 #include "player/player-status.h"
 #include "realm/realm-song-numbers.h"
 #include "spell/process-effect.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "util/util.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 4797c6e..b460c6b 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -4,16 +4,16 @@
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "util/util.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 8b80a0c..5068632 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -6,14 +6,14 @@
 #include "player/player-effects.h"
 #include "spell/process-effect.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 974747d..afe4a71 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -6,17 +6,17 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "spell/process-effect.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 07f2c7c..1f4f88d 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -5,13 +5,13 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-race.h"
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-detection.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-object.h"
-#include "spell/spells-pet.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-pet.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index 0e6f919..95cb061 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -9,14 +9,14 @@
 #include "player/player-race.h"
 #include "player/player-status.h"
 #include "spell/process-effect.h"
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-detection.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 62dabf2..266d65d 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -37,11 +37,11 @@
 #include "spell/process-effect.h"
 #include "spell/spells-execution.h"
 #include "spell/spells-hex.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "spell/technic-info-table.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 4201845..84541c0 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -20,11 +20,11 @@
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "spell/process-effect.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells-util.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index e41609b..ba13013 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -4,13 +4,13 @@
 #include "io/targeting.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index c4fc4da..45ff32d 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -12,15 +12,15 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "spell/process-effect.h"
-#include "spell/spells-beam.h"
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-beam.h"
+#include "spell-kind/spells-detection.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index bfef535..956e7ea 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -5,12 +5,12 @@
 #include "player/player-effects.h"
 #include "realm/realm-song-numbers.h"
 #include "spell/process-effect.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 7d8efef..135e2d7 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -4,13 +4,13 @@
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/selfinfo.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index b087fe4..efd4977 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -5,13 +5,13 @@
 #include "mutation/mutation.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c
index 369bca0..21e5d5b 100644 (file)
--- a/src/specific-object/chest.c
+++ b/src/specific-object/chest.c
@@ -12,8 +12,8 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"

diff --git a/src/spell-kind/spells-beam.c b/src/spell-kind/spells-beam.c
index 7e64cfa..645e6ed 100644 (file)
--- a/src/spell-kind/spells-beam.c
+++ b/src/spell-kind/spells-beam.c
@@ -1,7 +1,7 @@
-#include "spell/spells-beam.h"
+#include "spell-kind/spells-beam.h"
 #include "effect/effect-characteristics.h"
 #include "spell/spells-type.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 
 /*!
  * @brief 岩石溶解処理

diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c
index 9abffc8..b87db29 100644 (file)
--- a/src/spell-kind/spells-detection.c
+++ b/src/spell-kind/spells-detection.c
@@ -1,4 +1,4 @@
-#include "spell/spells-detection.h"
+#include "spell-kind/spells-detection.h"
 #include "core/player-processor.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index 51858ea..7b41507 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -4,7 +4,7 @@
  * @author deskull
  */
 
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-basic.h"
 #include "dungeon/dungeon.h"
@@ -26,7 +26,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "util/util.h"
 #include "view/display-main-window.h"
 

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 3b469eb..5342e2d 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -1,4 +1,4 @@
-#include "spell/spells-genocide.h"
+#include "spell-kind/spells-genocide.h"
 #include "core/stuff-handler.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-launcher.c b/src/spell-kind/spells-launcher.c
index 5569ac2..695968b 100644 (file)
--- a/src/spell-kind/spells-launcher.c
+++ b/src/spell-kind/spells-launcher.c
@@ -1,4 +1,4 @@
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "effect/effect-characteristics.h"
 #include "io/targeting.h"
 #include "spell/process-effect.h"

diff --git a/src/spell-kind/spells-lite.c b/src/spell-kind/spells-lite.c
index 1ff63a4..384a159 100644 (file)
--- a/src/spell-kind/spells-lite.c
+++ b/src/spell-kind/spells-lite.c
@@ -1,4 +1,4 @@
-#include "spell/spells-lite.h"
+#include "spell-kind/spells-lite.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
@@ -6,7 +6,7 @@
 #include "monster/monster-status.h"
 #include "player/player-effects.h"
 #include "spell/process-effect.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-type.h"
 #include "world/world.h"
 

diff --git a/src/spell-kind/spells-neighbor.c b/src/spell-kind/spells-neighbor.c
index 0835016..e6580a3 100644 (file)
--- a/src/spell-kind/spells-neighbor.c
+++ b/src/spell-kind/spells-neighbor.c
@@ -1,9 +1,9 @@
-#include "spell/spells-neighbor.h"
+#include "spell-kind/spells-neighbor.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
 #include "spell/process-effect.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-type.h"
 
 /*!

diff --git a/src/spell-kind/spells-pet.c b/src/spell-kind/spells-pet.c
index 1143eb9..a33632c 100644 (file)
--- a/src/spell-kind/spells-pet.c
+++ b/src/spell-kind/spells-pet.c
@@ -1,4 +1,4 @@
-#include "spell/spells-pet.h"
+#include "spell-kind/spells-pet.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "io/write-diary.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index def33a9..6d86c94 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -1,4 +1,4 @@
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-specific-bolt.c b/src/spell-kind/spells-specific-bolt.c
index dcd94c1..793a309 100644 (file)
--- a/src/spell-kind/spells-specific-bolt.c
+++ b/src/spell-kind/spells-specific-bolt.c
@@ -1,6 +1,6 @@
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "effect/effect-characteristics.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-type.h"
 
 /*!

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index de316fb..47a6944 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "cmd-io/cmd-save.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
@@ -19,7 +19,7 @@
 #include "object/object-hook.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
-#include "spell/spells-launcher.h"
+#include "spell-kind/spells-launcher.h"
 #include "spell/spells-type.h"
 #include "world/world.h"
 

diff --git a/src/spell-kind/spells-world.c b/src/spell-kind/spells-world.c
index cb10bde..d5940ac 100644 (file)
--- a/src/spell-kind/spells-world.c
+++ b/src/spell-kind/spells-world.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "spell/spells-world.h"
+#include "spell-kind/spells-world.h"
 #include "util/util.h"
 #include "world/world.h"
 

diff --git a/src/spell/spells-staff-only.c b/src/spell/spells-staff-only.c
index 6b2443b..6cd617b 100644 (file)
--- a/src/spell/spells-staff-only.c
+++ b/src/spell/spells-staff-only.c
@@ -3,7 +3,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "spell/process-effect.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-type.h"
 
 /*!

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index c803814..df348e1 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -22,8 +22,8 @@
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "util/util.h"
 #include "view/display-main-window.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index d75f52b..791902e 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -9,12 +9,12 @@
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "sv-definition/sv-other-types.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index b520bfd..553c305 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -52,16 +52,16 @@
 #include "player/player-status.h"
 #include "spell/process-effect.h"
 #include "spell/spells-diceroll.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-genocide.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
-#include "spell/spells-specific-bolt.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-genocide.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-specific-bolt.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/range-calc.h"
 #include "spell/spells3.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index fe98a98..8c18a08 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -64,11 +64,11 @@
 #include "player/player-status.h"
 #include "spell/process-effect.h"
 #include "spell/spells-execution.h"
-#include "spell/spells-floor.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells2.h"
 #include "spell/technic-info-table.h"
 #include "term/gameterm.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index d88864b..f3b1236 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -51,15 +51,15 @@
 #include "player/player-skill.h"
 #include "player/player-status.h"
 #include "player/selfinfo.h"
-#include "spell/spells-detection.h"
-#include "spell/spells-floor.h"
+#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-floor.h"
 #include "spell/spells-object.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-util.h"
-#include "spell/spells-world.h"
+#include "spell-kind/spells-world.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "system/angband-version.h"