[Refactor] #38997 disterb() に player_type * 引数を追加． / Add player_type * argument to...

diff --git a/src/autopick.c b/src/autopick.c
index 923f4f4..9931614 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1607,7 +1607,7 @@ static void auto_destroy_item(object_type *o_ptr, int autopick_idx)
 
        /* Now decided to destroy */
 
-       disturb(FALSE, FALSE);
+       disturb(p_ptr, FALSE, FALSE);
 
        /* Artifact? */
        if (!can_player_destroy_object(o_ptr))
@@ -1739,7 +1739,7 @@ void autopick_pickup_items(grid_type *g_ptr)
                if (idx >= 0 &&
                        (autopick_list[idx].action & (DO_AUTOPICK | DO_QUERY_AUTOPICK)))
                {
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
 
                        if (!inven_carry_okay(o_ptr))
                        {

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8611e12..ef374a5 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -900,7 +900,7 @@ void do_cmd_open(player_type *creature_ptr)
        }
 
        /* Cancel repeat unless we may continue */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 
@@ -1038,7 +1038,7 @@ void do_cmd_close(player_type *creature_ptr)
        }
 
        /* Cancel repeat unless we may continue */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 
@@ -1277,7 +1277,7 @@ void do_cmd_tunnel(player_type *creature_ptr)
        }
 
        /* Cancel repetition unless we can continue */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 /*!
@@ -1631,7 +1631,7 @@ void do_cmd_disarm(player_type *creature_ptr)
        }
 
        /* Cancel repeat unless told not to */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 
@@ -1807,7 +1807,7 @@ void do_cmd_bash(player_type *creature_ptr)
        }
 
        /* Unless valid action taken, cancel bash */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 
@@ -1908,7 +1908,7 @@ void do_cmd_alter(player_type *creature_ptr)
        }
 
        /* Cancel repetition unless we can continue */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 
@@ -2092,7 +2092,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup)
        }
 
        /* Cancel repeat unless we may continue */
-       if (!more) disturb(FALSE, FALSE);
+       if (!more) disturb(p_ptr, FALSE, FALSE);
 }
 
 

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index 0c049dc..1efb763 100644 (file)
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -2177,7 +2177,7 @@ bool py_attack(POSITION y, POSITION x, COMBAT_OPTION_IDX mode)
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
        GAME_TEXT m_name[MAX_NLEN];
 
-       disturb(FALSE, TRUE);
+       disturb(p_ptr, FALSE, TRUE);
 
        take_turn(p_ptr, 100);
 
@@ -2455,7 +2455,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                if (!effect || check_hit(power, rlev, MON_STUNNED(m_ptr)))
                {
                        /* Always disturbing */
-                       disturb(TRUE, TRUE);
+                       disturb(p_ptr, TRUE, TRUE);
 
 
                        /* Hack -- Apply "protection from evil" */
@@ -3967,7 +3967,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                /* Visible monsters */
                                if (m_ptr->ml)
                                {
-                                       disturb(TRUE, TRUE);
+                                       disturb(p_ptr, TRUE, TRUE);
 
 #ifdef JP
                                        if (abbreviate)
@@ -4177,7 +4177,7 @@ bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                current_floor_ptr->monster_noise = TRUE;
        }
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(p_ptr, TRUE, TRUE);
 
        /* Scan through all four blows */
        for (ap_cnt = 0; ap_cnt < 4; ap_cnt++)
@@ -4330,7 +4330,7 @@ bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
 
                        case RBM_EXPLODE:
                        {
-                               if (see_either) disturb(TRUE, TRUE);
+                               if (see_either) disturb(p_ptr, TRUE, TRUE);
                                act = _("爆発した。", "explodes.");
                                explode = TRUE;
                                touched = FALSE;
@@ -4774,7 +4774,7 @@ void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear,
 
        (void)set_monster_csleep(m_idx, 0);
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(p_ptr, TRUE, TRUE);
 
        if (MON_INVULNER(m_ptr) && randint0(PENETRATE_INVULNERABILITY))
        {

diff --git a/src/core.c b/src/core.c
index af204dd..32a3470 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -201,7 +201,7 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
        }
 
        /* Stop everything */
-       if (disturb_minor) disturb(FALSE, FALSE);
+       if (disturb_minor) disturb(p_ptr, FALSE, FALSE);
 
        /* Get an object description */
        object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
@@ -1050,7 +1050,7 @@ static void notice_lite_change(object_type *o_ptr)
        /* The light is now out */
        else if (o_ptr->xtra4 == 0)
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("明かりが消えてしまった！", "Your light has gone out!"));
 
                /* Recalculate torch radius */
@@ -1066,7 +1066,7 @@ static void notice_lite_change(object_type *o_ptr)
                if ((o_ptr->xtra4 < 50) && (!(o_ptr->xtra4 % 5))
                    && (current_world_ptr->game_turn % (TURNS_PER_TICK*2)))
                {
-                       if (disturb_minor) disturb(FALSE, TRUE);
+                       if (disturb_minor) disturb(p_ptr, FALSE, TRUE);
                        msg_print(_("明かりが微かになってきている。", "Your light is growing faint."));
                }
        }
@@ -1074,7 +1074,7 @@ static void notice_lite_change(object_type *o_ptr)
        /* The light is getting dim */
        else if ((o_ptr->xtra4 < 100) && (!(o_ptr->xtra4 % 10)))
        {
-               if (disturb_minor) disturb(FALSE, TRUE);
+               if (disturb_minor) disturb(p_ptr, FALSE, TRUE);
                        msg_print(_("明かりが微かになってきている。", "Your light is growing faint."));
        }
 }
@@ -1116,7 +1116,7 @@ static void recharged_notice(object_type *o_ptr)
                                msg_format("Your %s is recharged.", o_name);
 #endif
 
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
 
                        /* Done. */
                        return;
@@ -1310,7 +1310,7 @@ static void process_world_aux_digestion(void)
                        if (!p_ptr->paralyzed && (randint0(100) < 10))
                        {
                                msg_print(_("あまりにも空腹で気絶してしまった。", "You faint from the lack of food."));
-                               disturb(TRUE, TRUE);
+                               disturb(p_ptr, TRUE, TRUE);
 
                                /* Hack -- faint (bypass free action) */
                                (void)set_paralyzed(p_ptr, p_ptr->paralyzed + 1 + randint0(5));
@@ -2157,7 +2157,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_BERS_RAGE) && one_in_(3000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("ウガァァア！", "RAAAAGHH!"));
                msg_print(_("激怒の発作に襲われた！", "You feel a fit of rage coming over you!"));
                (void)set_shero(p_ptr, 10 + randint1(p_ptr->lev), FALSE);
@@ -2168,7 +2168,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_fear)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        msg_print(_("とても暗い... とても恐い！", "It's so dark... so scary!"));
                        set_afraid(p_ptr, p_ptr->afraid + 13 + randint1(26));
                }
@@ -2178,7 +2178,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_nexus && !(p_ptr->muta1 & MUT1_VTELEPORT) && !p_ptr->anti_tele)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        msg_print(_("あなたの位置は突然ひじょうに不確定になった...", "Your position suddenly seems very uncertain..."));
                        msg_print(NULL);
                        teleport_player(40, TELEPORT_PASSIVE);
@@ -2189,7 +2189,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_conf && !p_ptr->resist_chaos)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        p_ptr->redraw |= PR_EXTRA;
                        msg_print(_("いひきがもーろーとひてきたきがふる...ヒック！", "You feel a SSSCHtupor cOmINg over yOu... *HIC*!"));
                }
@@ -2226,7 +2226,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_chaos)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        p_ptr->redraw |= PR_EXTRA;
                        (void)set_image(p_ptr, p_ptr->image + randint0(50) + 20);
                }
@@ -2234,7 +2234,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_FLATULENT) && (randint1(3000) == 13))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("ブゥーーッ！おっと。", "BRRAAAP! Oops."));
                msg_print(NULL);
                fire_ball(GF_POIS, 0, p_ptr->lev, 3);
@@ -2244,7 +2244,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && one_in_(9000))
        {
                int dire = 0;
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("魔法のエネルギーが突然あなたの中に流れ込んできた！エネルギーを解放しなければならない！", 
                                                "Magical energy flows through you! You must release it!"));
 
@@ -2265,13 +2265,13 @@ static void process_world_aux_mutation(void)
                if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_DEMON, mode))
                {
                        msg_print(_("あなたはデーモンを引き寄せた！", "You have attracted a demon!"));
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_SPEED_FLUX) && one_in_(6000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                if (one_in_(2))
                {
                        msg_print(_("精力的でなくなった気がする。", "You feel less energetic."));
@@ -2302,7 +2302,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_BANISH_ALL) && one_in_(9000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("突然ほとんど孤独になった気がする。", "You suddenly feel almost lonely."));
 
                banish_monsters(100);
@@ -2374,13 +2374,13 @@ static void process_world_aux_mutation(void)
                if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_ANIMAL, mode))
                {
                        msg_print(_("動物を引き寄せた！", "You have attracted an animal!"));
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_RAW_CHAOS) && !p_ptr->anti_magic && one_in_(8000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("周りの空間が歪んでいる気がする！", "You feel the world warping around you!"));
 
                msg_print(NULL);
@@ -2393,7 +2393,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_WRAITH) && !p_ptr->anti_magic && one_in_(3000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("非物質化した！", "You feel insubstantial!"));
 
                msg_print(NULL);
@@ -2435,7 +2435,7 @@ static void process_world_aux_mutation(void)
 
                if (!sustained)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        msg_print(_("自分が衰弱していくのが分かる！", "You can feel yourself wasting away!"));
                        msg_print(NULL);
                        (void)dec_stat(p_ptr, which_stat, randint1(6) + 6, one_in_(3));
@@ -2452,7 +2452,7 @@ static void process_world_aux_mutation(void)
                if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_DRAGON, mode))
                {
                        msg_print(_("ドラゴンを引き寄せた！", "You have attracted a dragon!"));
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
        }
        if ((p_ptr->muta2 & MUT2_WEIRD_MIND) && !p_ptr->anti_magic && one_in_(3000))
@@ -2470,7 +2470,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_NAUSEA) && !p_ptr->slow_digest && one_in_(9000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("胃が痙攣し、食事を失った！", "Your stomach roils, and you lose your lunch!"));
                msg_print(NULL);
                set_food(p_ptr, PY_FOOD_WEAK);
@@ -2516,7 +2516,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_INVULN) && !p_ptr->anti_magic && one_in_(5000))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("無敵な気がする！", "You feel invincible!"));
                msg_print(NULL);
                (void)set_invuln(p_ptr, randint1(8) + 8, FALSE);
@@ -2557,7 +2557,7 @@ static void process_world_aux_mutation(void)
                INVENTORY_IDX slot = 0;
                object_type *o_ptr = NULL;
 
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                msg_print(_("足がもつれて転んだ！", "You trip over your own feet!"));
                take_hit(p_ptr, DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), _("転倒", "tripping"), -1);
 
@@ -2631,14 +2631,14 @@ static void process_world_aux_curse(void)
                        msg_format(_("%sがテレポートの能力を発動させようとしている。", "Your %s is activating teleportation."), o_name);
                        if (get_check_strict(_("テレポートしますか？", "Teleport? "), CHECK_OKAY_CANCEL))
                        {
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                                teleport_player(50, 0L);
                        }
                        else
                        {
                                msg_format(_("%sに{.}(ピリオド)と銘を刻むと発動を抑制できます。", 
                                                         "You can inscribe {.} on your %s to disable random teleportation. "), o_name);
-                               disturb(TRUE, TRUE);
+                               disturb(p_ptr, TRUE, TRUE);
                        }
                }
                /* Make a chainsword noise */
@@ -2647,7 +2647,7 @@ static void process_world_aux_curse(void)
                        char noise[1024];
                        if (!get_rnd_line(_("chainswd_j.txt", "chainswd.txt"), 0, noise))
                                msg_print(noise);
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
                }
                /* TY Curse */
                if ((p_ptr->cursed & TRC_TY_CURSE) && one_in_(TY_CURSE_CHANCE))
@@ -2718,7 +2718,7 @@ static void process_world_aux_curse(void)
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが動物を引き寄せた！", "Your %s have attracted an animal!"), o_name);
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                        }
                }
                /* Call demon */
@@ -2730,7 +2730,7 @@ static void process_world_aux_curse(void)
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが悪魔を引き寄せた！", "Your %s have attracted a demon!"), o_name);
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                        }
                }
                /* Call dragon */
@@ -2743,7 +2743,7 @@ static void process_world_aux_curse(void)
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sがドラゴンを引き寄せた！", "Your %s have attracted an dragon!"), o_name);
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                        }
                }
                /* Call undead */
@@ -2756,14 +2756,14 @@ static void process_world_aux_curse(void)
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_UNDEAD), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが死霊を引き寄せた！", "Your %s have attracted an undead!"), o_name);
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                        }
                }
                if ((p_ptr->cursed & TRC_COWARDICE) && one_in_(1500))
                {
                        if (!p_ptr->resist_fear)
                        {
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
                                msg_print(_("とても暗い... とても恐い！", "It's so dark... so scary!"));
                                set_afraid(p_ptr, p_ptr->afraid + 13 + randint1(26));
                        }
@@ -2771,7 +2771,7 @@ static void process_world_aux_curse(void)
                /* Teleport player */
                if ((p_ptr->cursed & TRC_TELEPORT) && one_in_(200) && !p_ptr->anti_tele)
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
 
                        /* Teleport player */
                        teleport_player(40, TELEPORT_PASSIVE);
@@ -2951,7 +2951,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->word_recall)
                {
                        /* Disturbing! */
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
 
                        /* Determine the level */
                        if (current_floor_ptr->dun_level || p_ptr->inside_quest || p_ptr->enter_dungeon)
@@ -3065,7 +3065,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->alter_reality)
                {
                        /* Disturbing! */
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
 
                        /* Determine the level */
                        if (!quest_number(current_floor_ptr->dun_level) && current_floor_ptr->dun_level)
@@ -3309,7 +3309,7 @@ static void process_world(void)
                /* Every 15 minutes after 11:00 pm */
                if ((hour == 23) && !(min % 15))
                {
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
 
                        switch (min / 15)
                        {
@@ -3335,7 +3335,7 @@ static void process_world(void)
                if (!hour && !min)
                {
 
-                       disturb(TRUE, TRUE);
+                       disturb(p_ptr, TRUE, TRUE);
                        msg_print(_("遠くで鐘が何回も鳴り、死んだような静けさの中へ消えていった。", "A distant bell tolls many times, fading into an deathly silence."));
 
                        if (p_ptr->wild_mode)
@@ -4317,7 +4317,7 @@ static void pack_overflow(void)
                /* Access the slot to be dropped */
                o_ptr = &p_ptr->inventory_list[INVEN_PACK];
 
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                /* Warning */
                msg_print(_("ザックからアイテムがあふれた！", "Your pack overflows!"));
@@ -4393,7 +4393,7 @@ static void process_fishing(void)
                {
                        msg_print(_("餌だけ食われてしまった！くっそ～！", "Damn!  The fish stole your bait!"));
                }
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
        }
 }
 
@@ -4500,7 +4500,7 @@ static void process_player(void)
                        {
                                flush(); /* Flush input */
 
-                               disturb(FALSE, TRUE);
+                               disturb(p_ptr, FALSE, TRUE);
 
                                /* Hack -- Show a Message */
                                msg_print(_("中断しました。", "Canceled."));
@@ -4936,7 +4936,7 @@ static void dungeon(bool load_game)
        repair_objects = TRUE;
 
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        /* Get index of current quest (if any) */
        quest_num = quest_number(current_floor_ptr->dun_level);

diff --git a/src/files.c b/src/files.c
index b5c6786..c0bacec 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -5975,7 +5975,7 @@ void do_cmd_save_game(int is_autosave)
        }
        else
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
        }
 
        /* Clear messages */
@@ -6516,7 +6516,7 @@ void exit_game_panic(void)
        prt("", 0, 0);
 
        /* Hack -- current_world_ptr->game_turn off some things */
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        /* Mega-Hack -- Delay death */
        if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;

diff --git a/src/floor-events.c b/src/floor-events.c
index a3f3df2..31cbf3d 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -321,7 +321,7 @@ void update_dungeon_feeling(floor_type *floor_ptr)
        /* Update the level indicator */
        p_ptr->redraw |= (PR_DEPTH);
 
-       if (disturb_minor) disturb(FALSE, FALSE);
+       if (disturb_minor) disturb(p_ptr, FALSE, FALSE);
 }
 
 

diff --git a/src/monster-process.c b/src/monster-process.c
index 9f6e699..3470d58 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -1384,7 +1384,7 @@ void process_monster(MONSTER_IDX m_idx)
                                msg_format(_("%sは傷の痛さの余りあなたの束縛から逃れようとしている。",
                                                         "%^s seems to be in so much pain, and trying to escape from your restriction."), m_name);
                                riding_pinch++;
-                               disturb(TRUE, TRUE);
+                               disturb(p_ptr, TRUE, TRUE);
                        }
                        else
                        {
@@ -1560,7 +1560,7 @@ void process_monster(MONSTER_IDX m_idx)
                    one_in_(CYBERNOISE) &&
                    !m_ptr->ml && (m_ptr->cdis <= MAX_SIGHT))
                {
-                       if (disturb_minor) disturb(FALSE, FALSE);
+                       if (disturb_minor) disturb(p_ptr, FALSE, FALSE);
                        msg_print(_("重厚な足音が聞こえた。", "You hear heavy steps."));
                }
 
@@ -1882,7 +1882,7 @@ void process_monster(MONSTER_IDX m_idx)
                                                msg_print(_("ドアを叩き開ける音がした！", "You hear a door burst open!"));
 
                                        /* Disturb (sometimes) */
-                                       if (disturb_minor) disturb(FALSE, FALSE);
+                                       if (disturb_minor) disturb(p_ptr, FALSE, FALSE);
 
                                        /* The door was bashed open */
                                        did_bash_door = TRUE;
@@ -2213,7 +2213,7 @@ void process_monster(MONSTER_IDX m_idx)
                             (disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)))
                        {
                                if (is_hostile(m_ptr))
-                                       disturb(FALSE, TRUE);
+                                       disturb(p_ptr, FALSE, TRUE);
                        }
 
                        /* Take or Kill objects on the floor */

diff --git a/src/monster2.c b/src/monster2.c
index 20a6060..8b0b3ef 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -2136,7 +2136,7 @@ void update_monster(MONSTER_IDX m_idx, bool full)
                        if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)))
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(TRUE, TRUE);
+                                       disturb(p_ptr, TRUE, TRUE);
                        }
                }
        }
@@ -2161,7 +2161,7 @@ void update_monster(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(TRUE, TRUE);
+                                       disturb(p_ptr, TRUE, TRUE);
                        }
                }
        }
@@ -2180,7 +2180,7 @@ void update_monster(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(TRUE, TRUE);
+                                       disturb(p_ptr, TRUE, TRUE);
                        }
                }
        }
@@ -2198,7 +2198,7 @@ void update_monster(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(TRUE, TRUE);
+                                       disturb(p_ptr, TRUE, TRUE);
                        }
                }
        }

diff --git a/src/mspells1.c b/src/mspells1.c
index 6dcc040..f71c209 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1714,7 +1714,7 @@ bool make_attack_spell(MONSTER_IDX m_idx)
        if (!spell_is_inate(thrown_spell)
            && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2)) || (randint0(100) < failrate)))
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), m_name);
 
                return (TRUE);

diff --git a/src/mspells2.c b/src/mspells2.c
index b2ffc18..be0f357 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -688,12 +688,12 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
        /* Choose a spell to cast */
        thrown_spell = spell[randint0(num)];
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(p_ptr, TRUE, TRUE);
 
        /* Check for spell failure (inate attacks never fail) */
        if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2))))
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (see_m) msg_format(_("%^sは呪文を唱えようとしたが失敗した。", 
                                            "%^s tries to cast a spell, but fails."), m_name);
 

diff --git a/src/mspells4.c b/src/mspells4.c
index c40192a..676550f 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -104,7 +104,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr
        monster_name(t_idx, t_name);
 
        if (mon_to_player || (mon_to_mon && known && see_either))
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
 
        if (msg_flag_aux)
        {
@@ -439,7 +439,7 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
        }
 
        if (mon_to_player || (mon_to_mon && known && see_either))
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
 
        if (m_ptr->r_idx == MON_JAIAN && GF_TYPE == GF_SOUND)
        {
@@ -823,7 +823,7 @@ HIT_POINT spell_RF5_DRAIN_MANA(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
        }
        else if (TARGET_TYPE == MONSTER_TO_MONSTER && see_monster(m_idx))
        { 
@@ -860,7 +860,7 @@ HIT_POINT spell_RF5_MIND_BLAST(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (!seen)
                        msg_print(_("何かがあなたの精神に念を放っているようだ。", "You feel something focusing on your mind."));
                else
@@ -897,7 +897,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (!seen)
                        msg_print(_("何かがあなたの精神に念を放っているようだ。", "You feel something focusing on your mind."));
                else
@@ -936,7 +936,7 @@ void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (p_ptr->blind)
                        msg_format(msg1, m_name);
                else
@@ -1384,7 +1384,7 @@ void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1,
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (p_ptr->blind)
                        msg_format(msg1, m_name);
                else
@@ -1779,7 +1779,7 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        monspell_message_base(m_idx, t_idx,
                _("%^sが何かをつぶやいた。", "%^s mumbles."),
@@ -1863,7 +1863,7 @@ void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
 
        if (teleport_barrier(m_idx))
        {
@@ -1894,7 +1894,7 @@ void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
        if (teleport_barrier(m_idx))
        {
                if(see_monster(m_idx))
@@ -1921,7 +1921,7 @@ HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
        if (m_ptr->r_idx == MON_DIO) who = 1;
        else if (m_ptr->r_idx == MON_WONG) who = 3;
        if (!set_monster_timewalk(randint1(2) + 2, who, TRUE)) return (FALSE);
@@ -2046,7 +2046,7 @@ HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
        if (one_in_(3) || !direct)
        {               
                simple_monspell_message(m_idx, t_idx,
@@ -2136,7 +2136,7 @@ HIT_POINT spell_RF6_SPECIAL(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
        monster_type    *m_ptr = &current_floor_ptr->m_list[m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
        switch (m_ptr->r_idx)
        {
                case MON_OHMU:
@@ -2465,7 +2465,7 @@ void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 {
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        if (p_ptr->blind)
                msg_format(_("%^sが何かをつぶやいて邪悪に微笑んだ。",
@@ -2488,7 +2488,7 @@ void spell_RF6_FORGET(MONSTER_IDX m_idx)
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        msg_format(_("%^sがあなたの記憶を消去しようとしている。",
                "%^s tries to blank your mind."), m_name);
@@ -2684,7 +2684,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
        monster_name(t_idx, t_name);
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
        if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
        {
                monspell_message(m_idx, t_idx,
@@ -2696,7 +2696,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
        else
        {
                if (mon_to_player || (mon_to_mon && known && see_either))
-                       disturb(TRUE, TRUE);
+                       disturb(p_ptr, TRUE, TRUE);
 
                if (p_ptr->blind)
                {
@@ -3229,7 +3229,7 @@ void spell_RF6_S_HI_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        GAME_TEXT m_name[MAX_NLEN];
        monster_name(m_idx, m_name);
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
        if (((m_ptr->r_idx == MON_MORGOTH) || (m_ptr->r_idx == MON_SAURON) || (m_ptr->r_idx == MON_ANGMAR)) &&
                ((r_info[MON_NAZGUL].cur_num + 2) < r_info[MON_NAZGUL].max_num) &&

diff --git a/src/player-damage.c b/src/player-damage.c
index f931b9d..969d3c8 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -400,7 +400,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
 
        if (damage_type != DAMAGE_USELIFE)
        {
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                if (auto_more)
                {
                        creature_ptr->now_damaged = TRUE;

diff --git a/src/player-effects.c b/src/player-effects.c
index 31bfcb5..fe151c7 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -400,7 +400,7 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, TRUE);
+       if (disturb_state) disturb(p_ptr, FALSE, TRUE);
 
        creature_ptr->redraw |= (PR_BASIC | PR_STATUS);
        creature_ptr->update |= (PU_BONUS | PU_HP);
@@ -467,7 +467,7 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v)
 
        /* Nothing to notice */
        if (!notice) return (FALSE);
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
 
        /* Fully update the visuals */
        creature_ptr->update |= (PU_UN_VIEW | PU_UN_LITE | PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
@@ -551,7 +551,7 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -594,7 +594,7 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -651,7 +651,7 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -697,7 +697,7 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATE);
        handle_stuff();
        return (TRUE);
@@ -748,7 +748,7 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, TRUE);
+       if (disturb_state) disturb(p_ptr, FALSE, TRUE);
 
        creature_ptr->redraw |= (PR_MAP | PR_HEALTH | PR_UHEALTH);
        creature_ptr->update |= (PU_MONSTERS);
@@ -800,7 +800,7 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -851,7 +851,7 @@ bool set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -898,7 +898,7 @@ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -947,7 +947,7 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -996,7 +996,7 @@ bool set_tsubureru(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1045,7 +1045,7 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1093,7 +1093,7 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1142,7 +1142,7 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -1194,7 +1194,7 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -1245,7 +1245,7 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -1306,7 +1306,7 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1372,7 +1372,7 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1420,7 +1420,7 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        creature_ptr->update |= (PU_MONSTERS);
        handle_stuff();
@@ -1469,7 +1469,7 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
@@ -1520,7 +1520,7 @@ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
@@ -1571,7 +1571,7 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1619,7 +1619,7 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1674,7 +1674,7 @@ bool set_superstealth(player_type *creature_ptr, bool set)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        return (TRUE);
 }
 
@@ -1720,7 +1720,7 @@ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1768,7 +1768,7 @@ bool set_tim_sh_touki(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -1815,7 +1815,7 @@ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1863,7 +1863,7 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1911,7 +1911,7 @@ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1960,7 +1960,7 @@ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2008,7 +2008,7 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2054,7 +2054,7 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2102,7 +2102,7 @@ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2150,7 +2150,7 @@ bool set_kabenuke(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2204,7 +2204,7 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -2277,7 +2277,7 @@ bool set_ele_attack(player_type *creature_ptr, u32b attack_type, TIME_EFFECT v)
 #endif
        }
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
        creature_ptr->update |= (PU_BONUS);
@@ -2340,7 +2340,7 @@ bool set_ele_immune(player_type *creature_ptr, u32b immune_type, TIME_EFFECT v)
                                        _("(なし)", "do nothing special.")))))));
        }
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATUS);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
@@ -2390,7 +2390,7 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2437,7 +2437,7 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2485,7 +2485,7 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2532,7 +2532,7 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2580,7 +2580,7 @@ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (!notice) return (FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2711,7 +2711,7 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v)
                case 0:
                        msg_print(_("やっと朦朧状態から回復した。", "You are no longer stunned."));
 
-                       if (disturb_state) disturb(FALSE, FALSE);
+                       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
                        break;
                }
 
@@ -2724,7 +2724,7 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v)
        /* No change */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw the "stun" */
@@ -2902,7 +2902,7 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v)
                        case 0:
                        msg_format(_("やっと%s。", "You are no longer bleeding."), creature_ptr->prace == RACE_ANDROID ? "怪我が直った" : "出血が止まった");
 
-                       if (disturb_state) disturb(FALSE, FALSE);
+                       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
                        break;
                }
 
@@ -2915,7 +2915,7 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v)
        /* No change */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw the "cut" */
@@ -3107,7 +3107,7 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw hunger */
@@ -4022,7 +4022,7 @@ bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -4064,7 +4064,7 @@ bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -4106,7 +4106,7 @@ bool set_tim_res_time(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(FALSE, FALSE);
+       if (disturb_state) disturb(p_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);

diff --git a/src/player-inventory.c b/src/player-inventory.c
index 82770d4..7ecd3b6 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -3019,7 +3019,7 @@ void py_pickup_floor(bool pickup)
                /* Access the next object */
                next_o_idx = o_ptr->next_o_idx;
 
-               disturb(FALSE, FALSE);
+               disturb(p_ptr, FALSE, FALSE);
 
                /* Pick up gold */
                if (o_ptr->tval == TV_GOLD)

diff --git a/src/player-move.c b/src/player-move.c
index 6060dc6..fe02e31 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -197,7 +197,7 @@ static void discover_hidden_things(POSITION y, POSITION x)
        {
                disclose_grid(y, x);
                msg_print(_("トラップを発見した。", "You have found a trap."));
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
        }
 
        /* Secret door */
@@ -205,7 +205,7 @@ static void discover_hidden_things(POSITION y, POSITION x)
        {
                msg_print(_("隠しドアを発見した。", "You have found a secret door."));
                disclose_grid(y, x);
-               disturb(FALSE, FALSE);
+               disturb(p_ptr, FALSE, FALSE);
        }
 
        /* Scan all objects in the grid */
@@ -220,7 +220,7 @@ static void discover_hidden_things(POSITION y, POSITION x)
                {
                        msg_print(_("箱に仕掛けられたトラップを発見した！", "You have discovered a trap on the chest!"));
                        object_known(o_ptr);
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
                }
        }
 }
@@ -399,7 +399,7 @@ void carry(bool pickup)
                object_desc(o_name, o_ptr, 0);
                next_o_idx = o_ptr->next_o_idx;
 
-               disturb(FALSE, FALSE);
+               disturb(p_ptr, FALSE, FALSE);
 
                /* Pick up gold */
                if (o_ptr->tval == TV_GOLD)
@@ -721,7 +721,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
        /* Handle "store doors" */
        if (have_flag(f_ptr->flags, FF_STORE))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                free_turn(creature_ptr);
                /* Hack -- Enter store */
@@ -731,7 +731,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
        /* Handle "building doors" -KMW- */
        else if (have_flag(f_ptr->flags, FF_BLDG))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                free_turn(creature_ptr);
                /* Hack -- Enter building */
@@ -741,7 +741,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
        /* Handle quest areas -KMW- */
        else if (have_flag(f_ptr->flags, FF_QUEST_ENTER))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                free_turn(creature_ptr);
                /* Hack -- Enter quest level */
@@ -768,7 +768,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
        /* Set off a trap */
        else if (have_flag(f_ptr->flags, FF_HIT_TRAP) && !(mpe_mode & MPE_STAYING))
        {
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                /* Hidden trap */
                if (g_ptr->mimic || have_flag(f_ptr->flags, FF_SECRET))
@@ -800,7 +800,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
                                msg_print(_("* 注意:この先はトラップの感知範囲外です！ *", "*Leaving trap detect region!*"));
                        }
 
-                       if (disturb_trap_detect) disturb(FALSE, TRUE);
+                       if (disturb_trap_detect) disturb(p_ptr, FALSE, TRUE);
                }
        }
 
@@ -1057,7 +1057,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        msg_print(_("動けない！", "Can't move!"));
                        free_turn(creature_ptr);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
                else if (MON_MONFEAR(riding_m_ptr))
                {
@@ -1065,12 +1065,12 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
                else if (creature_ptr->riding_ryoute)
                {
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
                else if (have_flag(f_ptr->flags, FF_CAN_FLY) && (riding_r_ptr->flags7 & RF7_CAN_FLY))
                {
@@ -1087,21 +1087,21 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        msg_format(_("%sの上に行けない。", "Can't swim."), f_name + f_info[get_feat_mimic(g_ptr)].name);
                        free_turn(creature_ptr);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
                else if (!have_flag(f_ptr->flags, FF_WATER) && (riding_r_ptr->flags7 & RF7_AQUATIC))
                {
                        msg_format(_("%sから上がれない。", "Can't land."), f_name + f_info[get_feat_mimic(&current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x])].name);
                        free_turn(creature_ptr);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
                else if (have_flag(f_ptr->flags, FF_LAVA) && !(riding_r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK))
                {
                        msg_format(_("%sの上に行けない。", "Too hot to go through."), f_name + f_info[get_feat_mimic(g_ptr)].name);
                        free_turn(creature_ptr);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
 
                if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
@@ -1110,7 +1110,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが朦朧としていてうまく動けない！", "You cannot control stunned %s!"), steed_name);
                        oktomove = FALSE;
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                }
        }
 
@@ -1216,7 +1216,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                        }
                }
 
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                if (!boundary_floor(g_ptr, f_ptr, mimic_f_ptr)) sound(SOUND_HITWALL);
        }
@@ -1230,7 +1230,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
                }
 
                /* To avoid a loop with running */
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
 
                oktomove = FALSE;
        }
@@ -1852,7 +1852,7 @@ void run_step(DIRECTION dir)
 
                        msg_print(_("その方向には走れません。", "You cannot run in that direction."));
 
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
 
                        return;
                }
@@ -1866,7 +1866,7 @@ void run_step(DIRECTION dir)
                /* Update run */
                if (run_test())
                {
-                       disturb(FALSE, FALSE);
+                       disturb(p_ptr, FALSE, FALSE);
 
                        return;
                }
@@ -1885,7 +1885,7 @@ void run_step(DIRECTION dir)
        {
                p_ptr->run_py = 0;
                p_ptr->run_px = 0;
-               disturb(FALSE, FALSE);
+               disturb(p_ptr, FALSE, FALSE);
        }
 }
 
@@ -2009,7 +2009,7 @@ void travel_step(void)
                        msg_print(_("道筋が見つかりません！", "No route is found!"));
                        travel.y = travel.x = 0;
                }
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                return;
        }
 
@@ -2273,7 +2273,7 @@ void do_cmd_travel(void)
  * The second arg is currently unused, but could induce output flush.
  * All disturbance cancels repeated commands, resting, and running.
  */
-void disturb(bool stop_search, bool stop_travel)
+void disturb(player_type *creature_ptr, bool stop_search, bool stop_travel)
 {
 #ifndef TRAVEL
        /* Unused */
@@ -2290,30 +2290,30 @@ void disturb(bool stop_search, bool stop_travel)
                command_rep = 0;
 
                /* Redraw the state (later) */
-               p_ptr->redraw |= (PR_STATE);
+               creature_ptr->redraw |= (PR_STATE);
        }
 
        /* Cancel Resting */
-       if ((p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH) || (stop_search && (p_ptr->action == ACTION_SEARCH)))
+       if ((creature_ptr->action == ACTION_REST) || (creature_ptr->action == ACTION_FISH) || (stop_search && (creature_ptr->action == ACTION_SEARCH)))
        {
                /* Cancel */
-               set_action(p_ptr, ACTION_NONE);
+               set_action(creature_ptr, ACTION_NONE);
        }
 
        /* Cancel running */
-       if (p_ptr->running)
+       if (creature_ptr->running)
        {
                /* Cancel */
-               p_ptr->running = 0;
+               creature_ptr->running = 0;
 
                /* Check for new panel if appropriate */
                if (center_player && !center_running) verify_panel();
 
                /* Calculate torch radius */
-               p_ptr->update |= (PU_TORCH);
+               creature_ptr->update |= (PU_TORCH);
 
                /* Update monster flow */
-               p_ptr->update |= (PU_FLOW);
+               creature_ptr->update |= (PU_FLOW);
        }
 
 #ifdef TRAVEL
@@ -2326,7 +2326,7 @@ void disturb(bool stop_search, bool stop_travel)
                if (center_player && !center_running) verify_panel();
 
                /* Calculate torch radius */
-               p_ptr->update |= (PU_TORCH);
+               creature_ptr->update |= (PU_TORCH);
        }
 #endif
 

diff --git a/src/player-move.h b/src/player-move.h
index f59b617..b938d4a 100644 (file)
--- a/src/player-move.h
+++ b/src/player-move.h
@@ -6,7 +6,7 @@
  */
 #define TRAVEL
 
-extern void disturb(bool stop_search, bool flush_output);
+extern void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
 extern void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool break_trap);
 extern void run_step(DIRECTION dir);
 

diff --git a/src/spells1.c b/src/spells1.c
index 5e78ba3..1e0c317 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1221,7 +1221,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        /* Get the monster possessive ("his"/"her"/"its") */
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 
-       if (p_ptr->riding && (g_ptr->m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
+       if (p_ptr->riding && (g_ptr->m_idx == p_ptr->riding)) disturb(p_ptr, TRUE, TRUE);
 
        if (r_ptr->flagsr & RFR_RES_ALL &&
                typ != GF_OLD_CLONE && typ != GF_STAR_HEAL && typ != GF_OLD_HEAL
@@ -4071,7 +4071,7 @@ static bool project_p(MONSTER_IDX who, concptr who_name, int r, POSITION y, POSI
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
 
-               disturb(TRUE, TRUE);
+               disturb(p_ptr, TRUE, TRUE);
                return TRUE;
        }
 
@@ -5071,7 +5071,7 @@ static bool project_p(MONSTER_IDX who, concptr who_name, int r, POSITION y, POSI
        }
 
 
-       disturb(TRUE, TRUE);
+       disturb(p_ptr, TRUE, TRUE);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))

diff --git a/src/targeting.c b/src/targeting.c
index 1460e67..e6bc8d3 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -182,7 +182,7 @@ void verify_panel(void)
        panel_col_min = pcol_min;
 
        /* Hack -- optional disturb on "panel change" */
-       if (disturb_panel && !center_player) disturb(FALSE, FALSE);
+       if (disturb_panel && !center_player) disturb(p_ptr, FALSE, FALSE);
 
        panel_bounds_center();
 

diff --git a/src/trap.c b/src/trap.c
index c68eddf..554e7b4 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -411,7 +411,7 @@ void hit_trap(bool break_trap)
        int trap_feat_type = have_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP;
        concptr name = _("トラップ", "a trap");
 
-       disturb(FALSE, TRUE);
+       disturb(p_ptr, FALSE, TRUE);
 
        cave_alter_feat(y, x, FF_HIT_TRAP);
 

diff --git a/src/warning.c b/src/warning.c
index 245cf58..6c0ad67 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -509,7 +509,7 @@ bool process_warning(POSITION xx, POSITION yy)
                                strcpy(o_name, _("体", "body")); /* Warning ability without item */
                        msg_format(_("%sが鋭く震えた！", "Your %s pulsates sharply!"), o_name);
 
-                       disturb(FALSE, TRUE);
+                       disturb(p_ptr, FALSE, TRUE);
                        return get_check(_("本当にこのまま進むか？", "Really want to go ahead? "));
                }
        }
@@ -526,7 +526,7 @@ bool process_warning(POSITION xx, POSITION yy)
                else
                        strcpy(o_name, _("体", "body")); /* Warning ability without item */
                msg_format(_("%sが鋭く震えた！", "Your %s pulsates sharply!"), o_name);
-               disturb(FALSE, TRUE);
+               disturb(p_ptr, FALSE, TRUE);
                return get_check(_("本当にこのまま進むか？", "Really want to go ahead? "));
        }