[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 74021d8..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)
        {
@@ -526,7 +526,7 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v)
                        /* Sniper */
                        if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
 
-                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all();
+                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                        notice = TRUE;
                        creature_ptr->counter = FALSE;
@@ -674,7 +674,7 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v)
                {
                        msg_print(_("体が麻痺してしまった！", "You are paralyzed!"));
                        if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
-                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all();
+                       if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                        creature_ptr->counter = FALSE;
                        notice = TRUE;
@@ -776,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;
@@ -2696,7 +2696,7 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v)
 
                /* Sniper */
                if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE);
-               if (hex_spelling_any(creature_ptr)) stop_hex_spell_all();
+               if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr);
 
                notice = TRUE;
        }
@@ -3094,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 */