[Refactor] #38997 detect_*() にplayer_type * 引数を追加 / Added player_type * argument...

[hengband/hengband.git] / src / realm-sorcery.c

diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index 3865c94..d3af297 100644 (file)
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -1,17 +1,24 @@
 #include "angband.h"
+#include "util.h"
+
 #include "cmd-spell.h"
 #include "selfinfo.h"
 #include "avatar.h"
+
+#include "spells.h"
 #include "spells-status.h"
 #include "spells-floor.h"
+#include "player-effects.h"
+#include "targeting.h"
 
 /*!
 * @brief 仙術領域魔法の各処理を行う
+* @param caster_ptr プレーヤーへの参照ポインタ
 * @param spell 魔法ID
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。
 */
-concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -19,7 +26,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
 
        DIRECTION dir;
-       PLAYER_LEVEL plev = p_ptr->lev;
+       PLAYER_LEVEL plev = caster_ptr->lev;
 
        switch (spell)
        {
@@ -34,7 +41,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_monsters_normal(rad);
+                               detect_monsters_normal(caster_ptr, rad);
                        }
                }
                break;
@@ -50,7 +57,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;
@@ -66,9 +73,9 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_traps(rad, TRUE);
-                               detect_doors(rad);
-                               detect_stairs(rad);
+                               detect_traps(caster_ptr, rad, TRUE);
+                               detect_doors(caster_ptr, rad);
+                               detect_stairs(caster_ptr, rad);
                        }
                }
                break;
@@ -120,7 +127,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;
@@ -154,7 +161,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!recharge(power)) return NULL;
+                               if (!recharge(caster_ptr, power)) return NULL;
                        }
                }
                break;
@@ -170,7 +177,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               map_area(rad);
+                               map_area(caster_ptr, rad);
                        }
                }
                break;
@@ -182,7 +189,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!ident_spell(FALSE)) return NULL;
+                               if (!ident_spell(caster_ptr, FALSE)) return NULL;
                        }
                }
                break;
@@ -234,7 +241,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               fire_beam(GF_AWAY_ALL, dir, power);
+                               fire_beam(caster_ptr, GF_AWAY_ALL, dir, power);
                        }
                }
                break;
@@ -251,7 +258,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_fast(randint1(sides) + base, FALSE);
+                               set_fast(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -268,7 +275,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_all(rad);
+                               detect_all(caster_ptr, rad);
                        }
                }
                break;
@@ -296,9 +303,9 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_objects_normal(rad);
-                               detect_treasure(rad);
-                               detect_objects_gold(rad);
+                               detect_objects_normal(caster_ptr, rad);
+                               detect_treasure(caster_ptr, rad);
+                               detect_objects_gold(caster_ptr, rad);
                        }
                }
                break;
@@ -333,7 +340,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_tim_esp(randint1(sides) + base, FALSE);
+                               set_tim_esp(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -345,7 +352,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!tele_town()) return NULL;
+                               if (!tele_town(caster_ptr)) return NULL;
                        }
                }
                break;
@@ -358,7 +365,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               self_knowledge();
+                               self_knowledge(caster_ptr);
                        }
                }
                break;
@@ -371,7 +378,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        if (cast)
                        {
                                if (!get_check(_("本当に他の階にテレポートしますか？", "Are you sure? (Teleport Level)"))) return NULL;
-                               teleport_level(0);
+                               teleport_level(caster_ptr, 0);
                        }
                }
                break;
@@ -389,7 +396,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!recall_player(p_ptr, randint0(21) + 15)) return NULL;
+                               if (!recall_player(caster_ptr, randint0(21) + 15)) return NULL;
                        }
                }
                break;
@@ -419,7 +426,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               probing();
+                               probing(caster_ptr);
                        }
                }
                break;
@@ -438,7 +445,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               explosive_rune();
+                               explosive_rune(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x);
                        }
                }
                break;
@@ -456,7 +463,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               fetch(dir, weight, FALSE);
+                               fetch(caster_ptr, dir, weight, FALSE);
                        }
                }
                break;
@@ -474,14 +481,14 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               chg_virtue(V_KNOWLEDGE, 1);
-                               chg_virtue(V_ENLIGHTEN, 1);
+                               chg_virtue(caster_ptr, V_KNOWLEDGE, 1);
+                               chg_virtue(caster_ptr, V_ENLIGHTEN, 1);
 
-                               wiz_lite(FALSE);
+                               wiz_lite(p_ptr, FALSE);
 
-                               if (!p_ptr->telepathy)
+                               if (!caster_ptr->telepathy)
                                {
-                                       set_tim_esp(randint1(sides) + base, FALSE);
+                                       set_tim_esp(caster_ptr, randint1(sides) + base, FALSE);
                                }
                        }
                }
@@ -510,7 +517,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!alchemy()) return NULL;
+                               if (!alchemy(caster_ptr)) return NULL;
                        }
                }
                break;
@@ -543,7 +550,7 @@ concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_invuln(randint1(base) + base, FALSE);
+                               set_invuln(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;