[Refactor] #38997 cast_summon_greater_demon() に player_type * 引数を追加． / Add player_typ...

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index 00675b7..df1b2a0 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -529,7 +529,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode
                {
                        if (cast)
                        {
-                               if (!cast_summon_greater_demon()) return NULL;
+                               if (!cast_summon_greater_demon(caster_ptr)) return NULL;
                        }
                }
                break;

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 5515200..d986900 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -198,9 +198,9 @@ bool item_tester_offer(object_type *o_ptr)
 * @brief 悪魔領域のグレーターデーモン召喚を処理する / Daemon spell Summon Greater Demon
 * @return 処理を実行したならばTRUEを返す。
 */
-bool cast_summon_greater_demon(void)
+bool cast_summon_greater_demon(player_type *caster_ptr)
 {
-       PLAYER_LEVEL plev = p_ptr->lev;
+       PLAYER_LEVEL plev = caster_ptr->lev;
        OBJECT_IDX item;
        concptr q, s;
        int summon_lev;
@@ -209,12 +209,12 @@ bool cast_summon_greater_demon(void)
        item_tester_hook = item_tester_offer;
        q = _("どの死体を捧げますか? ", "Sacrifice which corpse? ");
        s = _("捧げられる死体を持っていない。", "You have nothing to scrifice.");
-       o_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
+       o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
        if (!o_ptr) return FALSE;
 
        summon_lev = plev * 2 / 3 + r_info[o_ptr->pval].level;
 
-       if (summon_specific(-1, p_ptr->y, p_ptr->x, summon_lev, SUMMON_HI_DEMON, (PM_ALLOW_GROUP | PM_FORCE_PET)))
+       if (summon_specific(-1, caster_ptr->y, caster_ptr->x, summon_lev, SUMMON_HI_DEMON, (PM_ALLOW_GROUP | PM_FORCE_PET)))
        {
                msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone."));
                msg_print(_("「ご用でございますか、ご主人様」", "'What is thy bidding... Master?'"));

diff --git a/src/spells-summon.h b/src/spells-summon.h
index 057869d..545093f 100644 (file)
--- a/src/spells-summon.h
+++ b/src/spells-summon.h
@@ -63,7 +63,7 @@ extern bool cast_summon_hound(player_type *creature_ptr, int power);
 extern bool cast_summon_elemental(player_type *creature_ptr, int power);
 extern bool cast_summon_octopus(player_type *creature_ptr);
 extern bool item_tester_offer(object_type *o_ptr);
-extern bool cast_summon_greater_demon(void);
+extern bool cast_summon_greater_demon(player_type *caster_ptr);
 extern bool summon_kin_player(DEPTH level, POSITION y, POSITION x, BIT_FLAGS mode);
 extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x);