[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 3394238..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() || hex_spelling_any())
+       if (music_singing_any(creature_ptr) || hex_spelling_any(creature_ptr))
        {
-               concptr str = (music_singing_any()) ? _("歌", "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);
@@ -368,7 +368,6 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_mimic && (creature_ptr->mimic_form == p) && !do_dec)
@@ -383,7 +382,6 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_mimic)
@@ -402,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);
@@ -428,7 +426,6 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (!creature_ptr->blind)
@@ -443,11 +440,10 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v)
                        }
 
                        notice = TRUE;
-                       chg_virtue(p_ptr, V_ENLIGHTEN, -1);
+                       chg_virtue(creature_ptr, V_ENLIGHTEN, -1);
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->blind)
@@ -471,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);
@@ -494,7 +490,6 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (!creature_ptr->confused)
@@ -529,18 +524,16 @@ 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()) stop_hex_spell_all();
+                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                        notice = TRUE;
                        creature_ptr->counter = FALSE;
-                       chg_virtue(p_ptr, V_HARMONY, -1);
+                       chg_virtue(creature_ptr, V_HARMONY, -1);
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->confused)
@@ -558,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);
 }
@@ -576,7 +569,6 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (!creature_ptr->poisoned)
@@ -586,7 +578,6 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->poisoned)
@@ -603,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);
 }
@@ -621,7 +612,6 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (!creature_ptr->afraid)
@@ -641,11 +631,10 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v)
 
                        notice = TRUE;
                        creature_ptr->counter = FALSE;
-                       chg_virtue(p_ptr, V_VALOUR, -1);
+                       chg_virtue(creature_ptr, V_VALOUR, -1);
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->afraid)
@@ -662,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);
 }
@@ -679,24 +668,19 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (!creature_ptr->paralyzed)
                {
                        msg_print(_("体が麻痺してしまった！", "You are paralyzed!"));
-                       /* Sniper */
-                       if (creature_ptr->concent) reset_concentration(TRUE);
-
-                       /* Hex */
-                       if (hex_spelling_any()) 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;
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->paralyzed)
@@ -713,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);
@@ -733,7 +717,6 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v)
        if (creature_ptr->is_dead) return FALSE;
        if (creature_ptr->pseikaku == SEIKAKU_CHARGEMAN) v = 0;
 
-       /* Open */
        if (v)
        {
                set_tsuyoshi(creature_ptr, 0, TRUE);
@@ -742,14 +725,13 @@ 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;
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->image)
@@ -766,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);
@@ -788,26 +770,24 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->fast && !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;
-                       chg_virtue(p_ptr, V_PATIENCE, -1);
-                       chg_virtue(p_ptr, V_DILIGENCE, 1);
+                       chg_virtue(creature_ptr, V_PATIENCE, -1);
+                       chg_virtue(creature_ptr, V_DILIGENCE, 1);
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(MUSIC_SPEED) && !music_singing(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;
@@ -820,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);
@@ -841,7 +821,6 @@ bool set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->wild_mode) v = 0;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->lightspeed && !do_dec)
@@ -852,12 +831,11 @@ bool set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                {
                        msg_print(_("非常に素早く動けるようになった！", "You feel yourself moving extremely faster!"));
                        notice = TRUE;
-                       chg_virtue(p_ptr, V_PATIENCE, -1);
-                       chg_virtue(p_ptr, V_DILIGENCE, 1);
+                       chg_virtue(creature_ptr, V_PATIENCE, -1);
+                       chg_virtue(creature_ptr, V_DILIGENCE, 1);
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->lightspeed)
@@ -873,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);
@@ -892,7 +870,6 @@ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->slow && !do_dec)
@@ -906,7 +883,6 @@ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->slow)
@@ -922,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);
@@ -942,7 +918,6 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->shield && !do_dec)
@@ -956,7 +931,6 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->shield)
@@ -973,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);
@@ -993,7 +967,6 @@ bool set_tsubureru(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tsubureru && !do_dec)
@@ -1007,7 +980,6 @@ bool set_tsubureru(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tsubureru)
@@ -1024,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);
@@ -1044,7 +1016,6 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->magicdef && !do_dec)
@@ -1058,7 +1029,6 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->magicdef)
@@ -1075,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);
@@ -1094,7 +1064,6 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->blessed && !do_dec)
@@ -1108,10 +1077,9 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->blessed && !music_singing(MUSIC_BLESS))
+               if (creature_ptr->blessed && !music_singing(creature_ptr, MUSIC_BLESS))
                {
                        msg_print(_("高潔な気分が消え失せた。", "The prayer has expired."));
                        notice = TRUE;
@@ -1125,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);
@@ -1145,7 +1113,6 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->hero && !do_dec)
@@ -1159,10 +1126,9 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->hero && !music_singing(MUSIC_HERO) && !music_singing(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;
@@ -1176,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 */
@@ -1199,7 +1165,6 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (creature_ptr->is_dead) return FALSE;
 
        if (creature_ptr->pclass == CLASS_BERSERKER) v = 1;
-       /* Open */
        if (v)
        {
                if (creature_ptr->shero && !do_dec)
@@ -1213,7 +1178,6 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->shero)
@@ -1230,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 */
@@ -1252,7 +1216,6 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->protevil && !do_dec)
@@ -1266,7 +1229,6 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->protevil)
@@ -1283,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);
 }
@@ -1301,7 +1263,6 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->wraith_form && !do_dec)
@@ -1312,10 +1273,10 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                {
                        msg_print(_("物質界を離れて幽鬼のような存在になった！", "You leave the physical world and current_world_ptr->game_turn into a wraith-being!"));
                        notice = TRUE;
-                       chg_virtue(p_ptr, V_UNLIFE, 3);
-                       chg_virtue(p_ptr, V_HONOUR, -2);
-                       chg_virtue(p_ptr, V_SACRIFICE, -2);
-                       chg_virtue(p_ptr, V_VALOUR, -5);
+                       chg_virtue(creature_ptr, V_UNLIFE, 3);
+                       chg_virtue(creature_ptr, V_HONOUR, -2);
+                       chg_virtue(creature_ptr, V_SACRIFICE, -2);
+                       chg_virtue(creature_ptr, V_VALOUR, -5);
 
                        creature_ptr->redraw |= (PR_MAP);
                        creature_ptr->update |= (PU_MONSTERS);
@@ -1324,7 +1285,6 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->wraith_form)
@@ -1346,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);
@@ -1366,7 +1326,6 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->invuln && !do_dec)
@@ -1378,10 +1337,10 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                        msg_print(_("無敵だ！", "Invulnerability!"));
                        notice = TRUE;
 
-                       chg_virtue(p_ptr, V_UNLIFE, -2);
-                       chg_virtue(p_ptr, V_HONOUR, -2);
-                       chg_virtue(p_ptr, V_SACRIFICE, -3);
-                       chg_virtue(p_ptr, V_VALOUR, -5);
+                       chg_virtue(creature_ptr, V_UNLIFE, -2);
+                       chg_virtue(creature_ptr, V_HONOUR, -2);
+                       chg_virtue(creature_ptr, V_SACRIFICE, -3);
+                       chg_virtue(creature_ptr, V_VALOUR, -5);
 
                        creature_ptr->redraw |= (PR_MAP);
                        creature_ptr->update |= (PU_MONSTERS);
@@ -1390,10 +1349,9 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->invuln && !music_singing(MUSIC_INVULN))
+               if (creature_ptr->invuln && !music_singing(creature_ptr, MUSIC_INVULN))
                {
                        msg_print(_("無敵ではなくなった。", "The invulnerability wears off."));
                        notice = TRUE;
@@ -1414,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);
@@ -1433,7 +1391,6 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_esp && !do_dec)
@@ -1447,10 +1404,9 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->tim_esp && !music_singing(MUSIC_MIND))
+               if (creature_ptr->tim_esp && !music_singing(creature_ptr, MUSIC_MIND))
                {
                        msg_print(_("意識は元に戻った。", "Your consciousness contracts again."));
                        notice = TRUE;
@@ -1464,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();
@@ -1484,7 +1440,6 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_invis && !do_dec)
@@ -1498,7 +1453,6 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_invis)
@@ -1515,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 */
@@ -1537,7 +1491,6 @@ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_infra && !do_dec)
@@ -1551,7 +1504,6 @@ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_infra)
@@ -1568,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 */
@@ -1590,7 +1542,6 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_regen && !do_dec)
@@ -1604,7 +1555,6 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_regen)
@@ -1621,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);
@@ -1640,7 +1590,6 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_stealth && !do_dec)
@@ -1654,10 +1603,9 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->tim_stealth && !music_singing(MUSIC_STEALTH))
+               if (creature_ptr->tim_stealth && !music_singing(creature_ptr, MUSIC_STEALTH))
                {
                        msg_print(_("足音が大きくなった。", "You no longer walk silently."));
                        notice = TRUE;
@@ -1671,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);
@@ -1688,12 +1636,11 @@ bool set_superstealth(player_type *creature_ptr, bool set)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (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;
@@ -1711,7 +1658,6 @@ bool set_superstealth(player_type *creature_ptr, bool set)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->special_defense & NINJA_S_STEALTH)
@@ -1728,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);
 }
 
@@ -1745,7 +1691,6 @@ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_levitation && !do_dec)
@@ -1759,7 +1704,6 @@ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_levitation)
@@ -1776,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);
@@ -1795,7 +1739,6 @@ bool set_tim_sh_touki(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_sh_touki && !do_dec)
@@ -1809,7 +1752,6 @@ bool set_tim_sh_touki(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_sh_touki)
@@ -1826,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);
 }
@@ -1844,7 +1786,6 @@ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_sh_fire && !do_dec)
@@ -1858,7 +1799,6 @@ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_sh_fire)
@@ -1875,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);
@@ -1894,7 +1834,6 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_sh_holy && !do_dec)
@@ -1908,7 +1847,6 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_sh_holy)
@@ -1925,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);
@@ -1944,7 +1882,6 @@ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_eyeeye && !do_dec)
@@ -1958,7 +1895,6 @@ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_eyeeye)
@@ -1975,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);
@@ -1995,7 +1931,6 @@ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->resist_magic && !do_dec)
@@ -2009,7 +1944,6 @@ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->resist_magic)
@@ -2026,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);
@@ -2045,7 +1979,6 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_reflect && !do_dec)
@@ -2059,7 +1992,6 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_reflect)
@@ -2076,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);
@@ -2093,7 +2025,6 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->multishadow && !do_dec)
@@ -2107,7 +2038,6 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->multishadow)
@@ -2124,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);
@@ -2143,7 +2073,6 @@ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->dustrobe && !do_dec)
@@ -2157,7 +2086,6 @@ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->dustrobe)
@@ -2174,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);
@@ -2193,7 +2121,6 @@ bool set_kabenuke(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->kabenuke && !do_dec)
@@ -2207,7 +2134,6 @@ bool set_kabenuke(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->kabenuke)
@@ -2224,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);
@@ -2243,7 +2169,6 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tsuyoshi && !do_dec)
@@ -2254,11 +2179,10 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                {
                        msg_print(_("「オクレ兄さん！」", "Brother OKURE!"));
                        notice = TRUE;
-                       chg_virtue(p_ptr, V_VITALITY, 2);
+                       chg_virtue(creature_ptr, V_VITALITY, 2);
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tsuyoshi)
@@ -2269,7 +2193,7 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                        (void)dec_stat(creature_ptr, A_STR, 20, TRUE);
 
                        notice = TRUE;
-                       chg_virtue(p_ptr, V_VITALITY, -3);
+                       chg_virtue(creature_ptr, V_VITALITY, -3);
                }
        }
 
@@ -2280,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 */
@@ -2353,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);
@@ -2416,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();
@@ -2437,7 +2361,6 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->oppose_acid && !do_dec)
@@ -2451,10 +2374,9 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->oppose_acid && !music_singing(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;
@@ -2468,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);
 }
@@ -2486,7 +2408,6 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->oppose_elec && !do_dec)
@@ -2500,10 +2421,9 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->oppose_elec && !music_singing(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;
@@ -2517,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);
 }
@@ -2536,7 +2456,6 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if (creature_ptr->is_dead) return FALSE;
 
        if ((PRACE_IS_(creature_ptr, RACE_DEMON) && (creature_ptr->lev > 44)) || (creature_ptr->mimic_form == MIMIC_DEMON)) v = 1;
-       /* Open */
        if (v)
        {
                if (creature_ptr->oppose_fire && !do_dec)
@@ -2550,10 +2469,9 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->oppose_fire && !music_singing(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;
@@ -2567,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);
 }
@@ -2585,7 +2503,6 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->oppose_cold && !do_dec)
@@ -2599,10 +2516,9 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->oppose_cold && !music_singing(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;
@@ -2616,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);
 }
@@ -2635,7 +2551,6 @@ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
        if ((creature_ptr->pclass == CLASS_NINJA) && (creature_ptr->lev > 44)) v = 1;
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->oppose_pois && !do_dec)
@@ -2649,10 +2564,9 @@ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
-               if (creature_ptr->oppose_pois && !music_singing(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;
@@ -2666,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);
 }
@@ -2781,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()) 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;
        }
@@ -2799,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;
                }
 
@@ -2812,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" */
@@ -2990,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;
                }
 
@@ -3003,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" */
@@ -3118,13 +3030,13 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v)
        }
 
        if (old_aux < 1 && new_aux > 0)
-               chg_virtue(p_ptr, V_PATIENCE, 2);
+               chg_virtue(creature_ptr, V_PATIENCE, 2);
        else if (old_aux < 3 && (old_aux != new_aux))
-               chg_virtue(p_ptr, V_PATIENCE, 1);
+               chg_virtue(creature_ptr, V_PATIENCE, 1);
        if (old_aux == 2)
-               chg_virtue(p_ptr, V_TEMPERANCE, 1);
+               chg_virtue(creature_ptr, V_TEMPERANCE, 1);
        if (old_aux == 0)
-               chg_virtue(p_ptr, V_TEMPERANCE, -1);
+               chg_virtue(creature_ptr, V_TEMPERANCE, -1);
 
        /* Food increase */
        if (new_aux > old_aux)
@@ -3147,9 +3059,9 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v)
                        /* Bloated */
                        case 5:
                        msg_print(_("食べ過ぎだ！", "You have gorged yourself!"));
-                       chg_virtue(p_ptr, V_HARMONY, -1);
-                       chg_virtue(p_ptr, V_PATIENCE, -1);
-                       chg_virtue(p_ptr, V_TEMPERANCE, -2);
+                       chg_virtue(creature_ptr, V_HARMONY, -1);
+                       chg_virtue(creature_ptr, V_PATIENCE, -1);
+                       chg_virtue(creature_ptr, V_TEMPERANCE, -2);
 
                        break;
                }
@@ -3182,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 */
@@ -3195,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 */
@@ -3341,9 +3253,9 @@ bool dec_stat(player_type *creature_ptr, int stat, int amount, int permanent)
        /* Damage "max" value */
        if (permanent && (max > 3))
        {
-               chg_virtue(p_ptr, V_SACRIFICE, 1);
+               chg_virtue(creature_ptr, V_SACRIFICE, 1);
                if (stat == A_WIS || stat == A_INT)
-                       chg_virtue(p_ptr, V_ENLIGHTEN, -2);
+                       chg_virtue(creature_ptr, V_ENLIGHTEN, -2);
 
                /* Handle "low" values */
                if (max <= 18)
@@ -3421,7 +3333,7 @@ bool res_stat(player_type *creature_ptr, int stat)
 bool hp_player(player_type *creature_ptr, int num)
 {
        int vir;
-       vir = virtue_number(p_ptr, V_VITALITY);
+       vir = virtue_number(creature_ptr, V_VITALITY);
 
        if(num <= 0) return (FALSE);
 
@@ -3433,7 +3345,7 @@ bool hp_player(player_type *creature_ptr, int num)
        if (creature_ptr->chp < creature_ptr->mhp)
        {
                if ((num > 0) && (creature_ptr->chp < (creature_ptr->mhp/3)))
-                       chg_virtue(p_ptr, V_TEMPERANCE, 1);
+                       chg_virtue(creature_ptr, V_TEMPERANCE, 1);
                /* Gain hitpoints */
                creature_ptr->chp += num;
 
@@ -3558,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);
        }
 
@@ -3582,16 +3494,16 @@ bool do_inc_stat(player_type *creature_ptr, int stat)
        {
                if (stat == A_WIS)
                {
-                       chg_virtue(p_ptr, V_ENLIGHTEN, 1);
-                       chg_virtue(p_ptr, V_FAITH, 1);
+                       chg_virtue(creature_ptr, V_ENLIGHTEN, 1);
+                       chg_virtue(creature_ptr, V_FAITH, 1);
                }
                else if (stat == A_INT)
                {
-                       chg_virtue(p_ptr, V_KNOWLEDGE, 1);
-                       chg_virtue(p_ptr, V_ENLIGHTEN, 1);
+                       chg_virtue(creature_ptr, V_KNOWLEDGE, 1);
+                       chg_virtue(creature_ptr, V_ENLIGHTEN, 1);
                }
                else if (stat == A_CON)
-                       chg_virtue(p_ptr, V_VITALITY, 1);
+                       chg_virtue(creature_ptr, V_VITALITY, 1);
 
                msg_format(_("ワーオ！とても%sなった！", "Wow!  You feel very %s!"), desc_stat_pos[stat]);
 
@@ -3601,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);
        }
@@ -3625,7 +3537,7 @@ bool restore_level(player_type *creature_ptr)
                creature_ptr->exp = creature_ptr->max_exp;
 
                /* Check the experience */
-               check_experience();
+               check_experience(creature_ptr);
 
                /* Did something */
                return (TRUE);
@@ -3642,8 +3554,8 @@ bool lose_all_info(player_type *creature_ptr)
 {
        int i;
 
-       chg_virtue(p_ptr, V_KNOWLEDGE, -5);
-       chg_virtue(p_ptr, V_ENLIGHTEN, -5);
+       chg_virtue(creature_ptr, V_KNOWLEDGE, -5);
+       chg_virtue(creature_ptr, V_ENLIGHTEN, -5);
 
        /* Forget info about objects */
        for (i = 0; i < INVEN_TOTAL; i++)
@@ -3672,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);
@@ -3694,7 +3606,7 @@ void do_poly_wounds(player_type *creature_ptr)
        if (Nasty_effect)
        {
                msg_print(_("新たな傷ができた！", "A new wound was created!"));
-               take_hit(DAMAGE_LOSELIFE, change / 2, _("変化した傷", "a polymorphed wound"), -1);
+               take_hit(creature_ptr, DAMAGE_LOSELIFE, change / 2, _("変化した傷", "a polymorphed wound"), -1);
                set_cut(creature_ptr,change);
        }
        else
@@ -3718,7 +3630,7 @@ void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effe
        msg_format("You current_world_ptr->game_turn into %s %s%s!", (!effect_msg[0] && is_a_vowel(title[0]) ? "an" : "a"), effect_msg, title);
 #endif
 
-       chg_virtue(p_ptr, V_CHANCE, 2);
+       chg_virtue(creature_ptr, V_CHANCE, 2);
 
        if (creature_ptr->prace < 32)
        {
@@ -3742,7 +3654,7 @@ void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effe
                creature_ptr->expfact -= 15;
 
        /* Get character's height and weight */
-       get_height_weight(p_ptr);
+       get_height_weight(creature_ptr);
 
        /* Hitdice */
        if (creature_ptr->pclass == CLASS_SORCERER)
@@ -3753,7 +3665,7 @@ void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effe
        roll_hitdice(creature_ptr, 0L);
 
        /* The experience level may be modified */
-       check_experience();
+       check_experience(creature_ptr);
 
        creature_ptr->redraw |= (PR_BASIC);
 
@@ -3774,7 +3686,7 @@ void do_poly_self(player_type *creature_ptr)
        int power = creature_ptr->lev;
 
        msg_print(_("あなたは変化の訪れを感じた...", "You feel a change coming over you..."));
-       chg_virtue(p_ptr, V_CHANCE, 1);
+       chg_virtue(creature_ptr, V_CHANCE, 1);
 
        if ((power > randint0(20)) && one_in_(3) && (creature_ptr->prace != RACE_ANDROID))
        {
@@ -3840,7 +3752,7 @@ void do_poly_self(player_type *creature_ptr)
                        /* Polymorph into a less mutated form */
                        power -= 10;
 
-                       if (!lose_mutation(p_ptr, 0))
+                       if (!lose_mutation(creature_ptr, 0))
                        msg_print(_("奇妙なくらい普通になった気がする。", "You feel oddly normal."));
                }
 
@@ -3869,7 +3781,7 @@ void do_poly_self(player_type *creature_ptr)
                if (one_in_(6))
                {
                        msg_print(_("現在の姿で生きていくのは困難なようだ！", "You find living difficult in your present form!"));
-                       take_hit(DAMAGE_LOSELIFE, damroll(randint1(10), creature_ptr->lev), _("致命的な突然変異", "a lethal mutation"), -1);
+                       take_hit(creature_ptr, DAMAGE_LOSELIFE, damroll(randint1(10), creature_ptr->lev), _("致命的な突然変異", "a lethal mutation"), -1);
 
                        power -= 10;
                }
@@ -3879,7 +3791,7 @@ void do_poly_self(player_type *creature_ptr)
        {
                power -= 10;
 
-               get_max_stats(p_ptr);
+               get_max_stats(creature_ptr);
                roll_hitdice(creature_ptr, 0L);
        }
 
@@ -3898,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--;
        }
 }
@@ -3922,7 +3834,7 @@ void gain_exp_64(player_type *creature_ptr, s32b amount, u32b amount_frac)
                creature_ptr->max_exp += amount / 5;
        }
 
-       check_experience();
+       check_experience(creature_ptr);
 }
 
 
@@ -4019,12 +3931,12 @@ void calc_android_exp(player_type *creature_ptr)
                        if (value > 100000L)
                                exp += (value - 100000L) / 4  * level;
                }
-               if ((((i == INVEN_RARM) || (i == INVEN_LARM)) && (has_melee_weapon(i))) || (i == INVEN_BOW)) total_exp += exp / 48;
+               if ((((i == INVEN_RARM) || (i == INVEN_LARM)) && (has_melee_weapon(creature_ptr, i))) || (i == INVEN_BOW)) total_exp += exp / 48;
                else total_exp += exp / 16;
                if (i == INVEN_BODY) total_exp += exp / 32;
        }
        creature_ptr->exp = creature_ptr->max_exp = total_exp;
-       check_experience();
+       check_experience(creature_ptr);
 }
 
 
@@ -4038,7 +3950,7 @@ void lose_exp(player_type *creature_ptr, s32b amount)
 
        creature_ptr->exp -= amount;
 
-       check_experience();
+       check_experience(creature_ptr);
 }
 
 
@@ -4081,7 +3993,6 @@ bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->ult_res && !do_dec)
@@ -4095,7 +4006,6 @@ bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->ult_res)
@@ -4112,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);
@@ -4125,7 +4035,6 @@ bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_res_nether && !do_dec)
@@ -4139,7 +4048,6 @@ bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_res_nether)
@@ -4156,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);
@@ -4169,7 +4077,6 @@ bool set_tim_res_time(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 
        if (creature_ptr->is_dead) return FALSE;
 
-       /* Open */
        if (v)
        {
                if (creature_ptr->tim_res_time && !do_dec)
@@ -4183,7 +4090,6 @@ bool set_tim_res_time(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
                }
        }
 
-       /* Shut */
        else
        {
                if (creature_ptr->tim_res_time)
@@ -4200,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);
@@ -4216,7 +4122,7 @@ bool choose_ele_attack(player_type *creature_ptr)
 
        char choice;
 
-       if (!has_melee_weapon(INVEN_RARM) && !has_melee_weapon(INVEN_LARM))
+       if (!has_melee_weapon(creature_ptr, INVEN_RARM) && !has_melee_weapon(creature_ptr, INVEN_LARM))
        {
                msg_format(_("武器を持たないと魔法剣は使えない。", "You cannot use temporary branding with no weapon."));
                return FALSE;