[Refactor] #40414 Moved spells-hex.c/h from spell/ to spell-realm/

diff --git a/src/Makefile.am b/src/Makefile.am
index 1646776..9effff0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -394,7 +394,6 @@ hengband_SOURCES = \
        spell/spells-describer.c spell/spells-describer.h \
        spell/spells-diceroll.c spell/spells-diceroll.h \
        spell/spells-execution.c spell/spells-execution.h \
-       spell/spells-hex.c spell/spells-hex.h \
        spell/spells-object.c spell/spells-object.h \
        spell/spells-summon.c spell/spells-summon.h \
        spell/spells-staff-only.c spell/spells-staff-only.h \
@@ -419,6 +418,7 @@ hengband_SOURCES = \
        spell-kind/spells-world.c spell-kind/spells-world.h \
        \
        spell-realm/spells-crusade.c spell-realm/spells-crusade.h \
+       spell-realm/spells-hex.c spell-realm/spells-hex.h \
        \
        store/store.c store/store.h \
        store/black-market.c store/black-market.h \

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 8ffce39..2b01a58 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -30,7 +30,7 @@
 #include "spell/range-calc.h"
 #include "spell/spells-describer.h"
 #include "spell/spells-execution.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-util.h"
 #include "spell/spells3.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index b94a6af..3dcb426 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -34,7 +34,7 @@
 #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-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 6660d75..a253084 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -27,7 +27,7 @@
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "player/player-status.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "util/util.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index 2fb05f2..540dc26 100644 (file)
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -30,7 +30,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "spell/spells3.h"
 #include "util/util.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index f944f05..01fc389 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -27,7 +27,7 @@
 #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-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index a6befc0..9254533 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -55,7 +55,7 @@
 #include "player/player-move.h"
 #include "player/player-personalities-table.h"
 #include "player/player-status.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-teleport.h"
 #include "system/system-variables.h"
 #include "term/gameterm.h"

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index 849cd67..634d3eb 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -13,7 +13,7 @@
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.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 a5eb985..2bd8a03 100644 (file)
--- a/src/combat/aura-counterattack.c
+++ b/src/combat/aura-counterattack.c
@@ -11,7 +11,7 @@
 #include "object/object-hook.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 

diff --git a/src/combat/blood-sucking-processor.c b/src/combat/blood-sucking-processor.c
index 8f415c3..e5852da 100644 (file)
--- a/src/combat/blood-sucking-processor.c
+++ b/src/combat/blood-sucking-processor.c
@@ -9,7 +9,7 @@
 #include "monster/monster-race-hook.h"
 #include "player/player-effects.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 
 /*!
  * @brief 生命のあるモンスターから吸血できるか判定する

diff --git a/src/combat/monster-attack-monster.c b/src/combat/monster-attack-monster.c
index 61cdb04..5f0a435 100644 (file)
--- a/src/combat/monster-attack-monster.c
+++ b/src/combat/monster-attack-monster.c
@@ -18,7 +18,7 @@
 #include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index f7c69e1..2826395 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -30,7 +30,7 @@
 #include "player/player-skill.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 

diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index 27ed9c7..0a2b097 100644 (file)
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -29,7 +29,7 @@
 #include "player/player-skill.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell-kind/spells-floor.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "world/world.h"
 

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index f2bed58..422ea66 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -5,7 +5,7 @@
 #include "object/object1.h"
 #include "specific-object/torch.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 
 /*!
  * @brief プレイヤー攻撃の種族スレイング倍率計算

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 592579f..01e464b 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -15,7 +15,7 @@
 #include "player/player-skill.h"
 #include "spell/music-checker.h"
 #include "spell-kind/spells-chaos.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "view/display-main-window.h"
 
 bool load = TRUE;

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index a4feded..468ac5c 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -14,7 +14,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells-type.h"
 
 typedef enum effect_player_check_result

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 19c4e2c..a161cfe 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -24,7 +24,7 @@
 #include "player/player-effects.h"
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "system/system-variables.h"
 #include "util/util.h"
 #include "view/display-main-window.h"

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 82791a0..edd94f0 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -12,7 +12,7 @@
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object-enchant/special-object-flags.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "object-enchant/tr-types.h"

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 572c19f..9217e46 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -11,7 +11,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "term/gameterm.h"
 #include "world/world.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index a543d21..7e29de1 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -43,7 +43,7 @@
 #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-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell/spells-object.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 69895e6..b73ae35 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -35,7 +35,7 @@
 #include "mspell/monster-spell.h"
 #include "monster/monster-process.h"
 #include "object-enchant/trc-types.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 
 void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon);
 bool process_stealth(player_type *target_ptr, MONSTER_IDX m_idx);

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 2cf0f51..66bdb51 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -14,7 +14,7 @@
 #include "player/player-move.h"
 #include "player/player-personalities-table.h"
 #include "spell/process-effect.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index c882aed..3865ed7 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -57,7 +57,7 @@
 #include "player/player-class.h"
 #include "spell/process-effect.h"
 #include "spell/range-calc.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.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 155c22d..dcd1c66 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -29,7 +29,7 @@
 #include "world/world.h"
 #include "view/display-main-window.h"
 #include "mspell/assign-monster-spell.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 
  /*!
   * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 8d8c2d9..d929900 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -8,7 +8,7 @@
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "spell-kind/spells-floor.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-sight.h"

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

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 80b72ec..109c8da 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -55,7 +55,7 @@
 #include "realm/realm-song-numbers.h"
 #include "spell/spells-describer.h"
 #include "spell/spells-execution.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "spell/spells-util.h"
 #include "spell/range-calc.h"

diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c
index 7a79b5d..a09b8c8 100644 (file)
--- a/src/player/temporary-resistances.c
+++ b/src/player/temporary-resistances.c
@@ -3,7 +3,7 @@
 #include "player/player-races-table.h"
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-song-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 
 /*!
  * @brief プレイヤーの一時的魔法効果による耐性を返す

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 266d65d..a79695c 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -36,7 +36,7 @@
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
 #include "spell/spells-execution.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"

diff --git a/src/spell-realm/spells-hex.c b/src/spell-realm/spells-hex.c
index 895d40c..57adae2 100644 (file)
--- a/src/spell-realm/spells-hex.c
+++ b/src/spell-realm/spells-hex.c
@@ -1,4 +1,4 @@
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "floor/floor.h"
 #include "player/player-effects.h" // todo 相互参照している.
 #include "player/player-skill.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 3ed6018..1a3ef39 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -43,7 +43,7 @@
 #include "player/player-status.h"
 #include "realm/realm-hex-numbers.h"
 #include "realm/realm-song-numbers.h"
-#include "spell/spells-hex.h"
+#include "spell-realm/spells-hex.h"
 #include "spell/spells3.h"
 #include "system/system-variables.h"
 #include "term/gameterm.h"