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

[hengband/hengband.git] / src / player-effects.c

diff --git a/src/player-effects.c b/src/player-effects.c
index b025a26..5b2e8fe 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -165,7 +165,7 @@ void set_action(player_type *creature_ptr, ACTION_IDX typ)
 
        /* If we are requested other action, stop singing */
        if (prev_typ == ACTION_SING) stop_singing(creature_ptr);
-       if (prev_typ == ACTION_SPELL) stop_hex_spell();
+       if (prev_typ == ACTION_SPELL) stop_hex_spell(creature_ptr);
 
        switch (creature_ptr->action)
        {
@@ -338,9 +338,9 @@ void dispel_player(player_type *creature_ptr)
                msg_print(_("手の輝きがなくなった。", "Your hands stop glowing."));
        }
 
-       if (music_singing_any(p_ptr) || hex_spelling_any(p_ptr))
+       if (music_singing_any(creature_ptr) || hex_spelling_any(creature_ptr))
        {
-               concptr str = (music_singing_any(p_ptr)) ? _("歌", "singing") : _("呪文", "spelling");
+               concptr str = (music_singing_any(creature_ptr)) ? _("歌", "singing") : _("呪文", "spelling");
                INTERUPTING_SONG_EFFECT(creature_ptr) = SINGING_SONG_EFFECT(creature_ptr);
                SINGING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
                msg_format(_("%sが途切れた。", "Your %s is interrupted."), str);
@@ -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(creature_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(creature_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);
@@ -524,10 +524,9 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v)
                        }
 
                        /* Sniper */
-                       if (creature_ptr->concent) reset_concentration(TRUE);
+                       if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
 
-                       /* Hex */
-                       if (hex_spelling_any(p_ptr)) stop_hex_spell_all();
+                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                        notice = TRUE;
                        creature_ptr->counter = FALSE;
@@ -552,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -595,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -652,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -674,11 +673,8 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v)
                if (!creature_ptr->paralyzed)
                {
                        msg_print(_("体が麻痺してしまった！", "You are paralyzed!"));
-                       /* Sniper */
-                       if (creature_ptr->concent) reset_concentration(TRUE);
-
-                       /* Hex */
-                       if (hex_spelling_any(p_ptr)) stop_hex_spell_all();
+                       if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
+                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                        creature_ptr->counter = FALSE;
                        notice = TRUE;
@@ -701,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(creature_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATE);
        handle_stuff();
        return (TRUE);
@@ -729,7 +725,7 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v)
                        msg_print(_("ワーオ！何もかも虹色に見える！", "Oh, wow! Everything looks so cosmic now!"));
 
                        /* Sniper */
-                       if (creature_ptr->concent) reset_concentration(TRUE);
+                       if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
 
                        creature_ptr->counter = FALSE;
                        notice = TRUE;
@@ -752,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(creature_ptr, FALSE, TRUE);
 
        creature_ptr->redraw |= (PR_MAP | PR_HEALTH | PR_UHEALTH);
        creature_ptr->update |= (PU_MONSTERS);
@@ -780,7 +776,7 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                {
                        if (creature_ptr->fast > v) return FALSE;
                }
-               else if (!IS_FAST() && !creature_ptr->lightspeed)
+               else if (!IS_FAST(creature_ptr) && !creature_ptr->lightspeed)
                {
                        msg_print(_("素早く動けるようになった！", "You feel yourself moving much faster!"));
                        notice = TRUE;
@@ -791,7 +787,7 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(p_ptr, MUSIC_SPEED) && !music_singing(p_ptr, MUSIC_SHERO))
+               if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(creature_ptr, MUSIC_SPEED) && !music_singing(creature_ptr, MUSIC_SHERO))
                {
                        msg_print(_("動きの素早さがなくなったようだ。", "You feel yourself slow down."));
                        notice = TRUE;
@@ -804,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -855,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -902,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -951,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1000,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1049,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1083,7 +1079,7 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->blessed && !music_singing(p_ptr, MUSIC_BLESS))
+               if (creature_ptr->blessed && !music_singing(creature_ptr, MUSIC_BLESS))
                {
                        msg_print(_("高潔な気分が消え失せた。", "The prayer has expired."));
                        notice = TRUE;
@@ -1097,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1132,7 +1128,7 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->hero && !music_singing(p_ptr, MUSIC_HERO) && !music_singing(p_ptr, MUSIC_SHERO))
+               if (creature_ptr->hero && !music_singing(creature_ptr, MUSIC_HERO) && !music_singing(creature_ptr, MUSIC_SHERO))
                {
                        msg_print(_("ヒーローの気分が消え失せた。", "The heroism wears off."));
                        notice = TRUE;
@@ -1146,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -1198,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -1249,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -1310,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1355,7 +1351,7 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->invuln && !music_singing(p_ptr, MUSIC_INVULN))
+               if (creature_ptr->invuln && !music_singing(creature_ptr, MUSIC_INVULN))
                {
                        msg_print(_("無敵ではなくなった。", "The invulnerability wears off."));
                        notice = TRUE;
@@ -1376,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1410,7 +1406,7 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->tim_esp && !music_singing(p_ptr, MUSIC_MIND))
+               if (creature_ptr->tim_esp && !music_singing(creature_ptr, MUSIC_MIND))
                {
                        msg_print(_("意識は元に戻った。", "Your consciousness contracts again."));
                        notice = TRUE;
@@ -1424,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        creature_ptr->update |= (PU_MONSTERS);
        handle_stuff();
@@ -1473,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
@@ -1524,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
@@ -1575,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1609,7 +1605,7 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->tim_stealth && !music_singing(p_ptr, MUSIC_STEALTH))
+               if (creature_ptr->tim_stealth && !music_singing(creature_ptr, MUSIC_STEALTH))
                {
                        msg_print(_("足音が大きくなった。", "You no longer walk silently."));
                        notice = TRUE;
@@ -1623,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1644,7 +1640,7 @@ bool set_superstealth(player_type *creature_ptr, bool set)
        {
                if (!(creature_ptr->special_defense & NINJA_S_STEALTH))
                {
-                       if (current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_MNLT)
+                       if (p_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_MNLT)
                        {
                                msg_print(_("敵の目から薄い影の中に覆い隠された。", "You are mantled in weak shadow from ordinary eyes."));
                                creature_ptr->monlite = creature_ptr->old_monlite = TRUE;
@@ -1678,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(creature_ptr, FALSE, FALSE);
        return (TRUE);
 }
 
@@ -1724,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1772,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -1819,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1867,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1915,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -1964,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2012,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2058,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2106,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2154,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -2208,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
@@ -2281,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(creature_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATUS);
 
        creature_ptr->update |= (PU_BONUS);
@@ -2344,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(creature_ptr, FALSE, FALSE);
        creature_ptr->redraw |= (PR_STATUS);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
@@ -2380,7 +2376,7 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->oppose_acid && !music_singing(p_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
+               if (creature_ptr->oppose_acid && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
                {
                        msg_print(_("酸への耐性が薄れた気がする。", "You feel less resistant to acid."));
                        notice = TRUE;
@@ -2394,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2427,7 +2423,7 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->oppose_elec && !music_singing(p_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
+               if (creature_ptr->oppose_elec && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
                {
                        msg_print(_("電撃への耐性が薄れた気がする。", "You feel less resistant to electricity."));
                        notice = TRUE;
@@ -2441,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2475,7 +2471,7 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->oppose_fire && !music_singing(p_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
+               if (creature_ptr->oppose_fire && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
                {
                        msg_print(_("火への耐性が薄れた気がする。", "You feel less resistant to fire."));
                        notice = TRUE;
@@ -2489,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2522,7 +2518,7 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->oppose_cold && !music_singing(p_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
+               if (creature_ptr->oppose_cold && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
                {
                        msg_print(_("冷気への耐性が薄れた気がする。", "You feel less resistant to cold."));
                        notice = TRUE;
@@ -2536,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2570,7 +2566,7 @@ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        else
        {
-               if (creature_ptr->oppose_pois && !music_singing(p_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
+               if (creature_ptr->oppose_pois && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU))
                {
                        msg_print(_("毒への耐性が薄れた気がする。", "You feel less resistant to poison."));
                        notice = TRUE;
@@ -2584,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(creature_ptr, FALSE, FALSE);
        handle_stuff();
        return (TRUE);
 }
@@ -2699,10 +2695,8 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v)
                }
 
                /* Sniper */
-               if (creature_ptr->concent) reset_concentration(TRUE);
-
-               /* Hex */
-               if (hex_spelling_any(p_ptr)) stop_hex_spell_all();
+               if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
+               if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                notice = TRUE;
        }
@@ -2717,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(creature_ptr, FALSE, FALSE);
                        break;
                }
 
@@ -2730,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw the "stun" */
@@ -2908,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(creature_ptr, FALSE, FALSE);
                        break;
                }
 
@@ -2921,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw the "cut" */
@@ -3100,7 +3094,7 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v)
 
                if (creature_ptr->wild_mode && (new_aux < 2))
                {
-                       change_wild_mode(FALSE);
+                       change_wild_mode(creature_ptr, FALSE);
                }
 
                /* Change */
@@ -3113,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
 
        /* Redraw hunger */
@@ -3476,7 +3470,7 @@ bool do_res_stat(player_type *creature_ptr, int stat)
        /* Attempt to increase */
        if (res_stat(creature_ptr, stat))
        {
-               msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
+               msg_format(_("元通りに%sなった気がする。", "You feel more %s."), desc_stat_pos[stat]);
                return (TRUE);
        }
 
@@ -3519,7 +3513,7 @@ bool do_inc_stat(player_type *creature_ptr, int stat)
        /* Restoration worked */
        if (res)
        {
-               msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
+               msg_format(_("元通りに%sなった気がする。", "You feel more %s."), desc_stat_pos[stat]);
 
                return (TRUE);
        }
@@ -3590,7 +3584,7 @@ bool lose_all_info(player_type *creature_ptr)
        creature_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        /* Mega-Hack -- Forget the map */
-       wiz_dark();
+       wiz_dark(creature_ptr);
 
        /* It worked */
        return (TRUE);
@@ -3816,7 +3810,7 @@ void do_poly_self(player_type *creature_ptr)
        /* Note: earlier deductions may have left power < 0 already. */
        while (power > 0)
        {
-               status_shuffle();
+               status_shuffle(creature_ptr);
                power--;
        }
 }
@@ -4028,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -4070,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);
@@ -4112,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(creature_ptr, FALSE, FALSE);
        creature_ptr->update |= (PU_BONUS);
        handle_stuff();
        return (TRUE);