[Refactor] #38997 PRACE_IS_ マクロに player_type の引数を追加．

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

diff --git a/src/player-effects.c b/src/player-effects.c
index 1c68a1d..8395704 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -266,7 +266,7 @@ void reset_tim_flags(void)
        while(p_ptr->energy_need < 0) p_ptr->energy_need += ENERGY_NEED();
        p_ptr->timewalk = FALSE;
 
-       if (PRACE_IS_(RACE_DEMON) && (p_ptr->lev > 44)) p_ptr->oppose_fire = 1;
+       if (PRACE_IS_(p_ptr, RACE_DEMON) && (p_ptr->lev > 44)) p_ptr->oppose_fire = 1;
        if ((p_ptr->pclass == CLASS_NINJA) && (p_ptr->lev > 44)) p_ptr->oppose_pois = 1;
        if (p_ptr->pclass == CLASS_BERSERKER) p_ptr->shero = 1;
 
@@ -2536,7 +2536,7 @@ bool set_oppose_fire(TIME_EFFECT v, bool do_dec)
 
        if (p_ptr->is_dead) return FALSE;
 
-       if ((PRACE_IS_(RACE_DEMON) && (p_ptr->lev > 44)) || (p_ptr->mimic_form == MIMIC_DEMON)) v = 1;
+       if ((PRACE_IS_(p_ptr, RACE_DEMON) && (p_ptr->lev > 44)) || (p_ptr->mimic_form == MIMIC_DEMON)) v = 1;
        /* Open */
        if (v)
        {
@@ -2686,7 +2686,7 @@ bool set_stun(TIME_EFFECT v)
        v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
 
        if (p_ptr->is_dead) return FALSE;
-       if (PRACE_IS_(RACE_GOLEM) || ((p_ptr->pclass == CLASS_BERSERKER) && (p_ptr->lev > 34))) v = 0;
+       if (PRACE_IS_(p_ptr, RACE_GOLEM) || ((p_ptr->pclass == CLASS_BERSERKER) && (p_ptr->lev > 34))) v = 0;
 
        /* Knocked out */
        if (p_ptr->stun > 100)