[Refactor] #40414 Moved confusing_light() from spells2.c/h to racial-mirror-master.c/h

diff --git a/src/mind/racial-mirror-master.c b/src/mind/racial-mirror-master.c
index ed5e81a..ec5264d 100644 (file)
--- a/src/mind/racial-mirror-master.c
+++ b/src/mind/racial-mirror-master.c
@@ -7,6 +7,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"
 #include "spell/process-effect.h"
+#include "spell/spells-sight.h"
 #include "spell/spells-type.h"
 #include "term/gameterm.h"
 #include "view/display-main-window.h"
@@ -215,3 +216,19 @@ void seal_of_mirror(player_type *caster_ptr, HIT_POINT dam)
         }
     }
 }
+
+/*!
+ * 幻惑の光 @ 鏡使いだけでなく混沌の戦士も使える
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return 常にTRUE
+ */
+bool confusing_light(player_type *creature_ptr)
+{
+    msg_print(_("辺りを睨んだ...", "You glare nearby monsters..."));
+    slow_monsters(creature_ptr, creature_ptr->lev);
+    stun_monsters(creature_ptr, creature_ptr->lev * 4);
+    confuse_monsters(creature_ptr, creature_ptr->lev * 4);
+    turn_monsters(creature_ptr, creature_ptr->lev * 4);
+    stasis_monsters(creature_ptr, creature_ptr->lev * 4);
+    return TRUE;
+}

diff --git a/src/mind/racial-mirror-master.h b/src/mind/racial-mirror-master.h
index 28f559a..73999cc 100644 (file)
--- a/src/mind/racial-mirror-master.h
+++ b/src/mind/racial-mirror-master.h
@@ -7,3 +7,4 @@ bool mirror_concentration(player_type *creature_ptr);
 void remove_all_mirrors(player_type *caster_ptr, bool explode);
 bool binding_field(player_type *caster_ptr, HIT_POINT dam);
 void seal_of_mirror(player_type *caster_ptr, HIT_POINT dam);
+bool confusing_light(player_type *creature_ptr);

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 656990a..50b2070 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -2197,23 +2197,6 @@ bool sword_dancing(player_type *creature_ptr)
 }
 
 
-/*!
- * 幻惑の光
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return 常にTRUE
-*/
-bool confusing_light(player_type *creature_ptr)
-{
-       msg_print(_("辺りを睨んだ...", "You glare nearby monsters..."));
-       slow_monsters(creature_ptr, creature_ptr->lev);
-       stun_monsters(creature_ptr, creature_ptr->lev * 4);
-       confuse_monsters(creature_ptr, creature_ptr->lev * 4);
-       turn_monsters(creature_ptr, creature_ptr->lev * 4);
-       stasis_monsters(creature_ptr, creature_ptr->lev * 4);
-       return TRUE;
-}
-
-
 bool clear_mind(player_type *creature_ptr)
 {
        if (total_friends)

diff --git a/src/spell/spells2.h b/src/spell/spells2.h
index cbb3401..c5e74af 100644 (file)
--- a/src/spell/spells2.h
+++ b/src/spell/spells2.h
@@ -49,6 +49,5 @@ bool comvert_hp_to_mp(player_type* creature_ptr);
 bool comvert_mp_to_hp(player_type* creature_ptr);
 bool demonic_breath(player_type* creature_ptr);
 bool sword_dancing(player_type* creature_ptr);
-bool confusing_light(player_type* creature_ptr);
 bool clear_mind(player_type* creature_ptr);
 bool vanish_dungeon(player_type* caster_ptr);