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

[hengband/hengband.git] / src / spells-status.c

diff --git a/src/spells-status.c b/src/spells-status.c
index f67ac84..8bdcf6f 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -173,7 +173,7 @@ void stop_singing(player_type *creature_ptr)
        if (creature_ptr->action == ACTION_SING) set_action(p_ptr, ACTION_NONE);
 
        /* Message text of each song or etc. */
-       exe_spell(REALM_MUSIC, SINGING_SONG_ID(creature_ptr), SPELL_STOP);
+       exe_spell(p_ptr, REALM_MUSIC, SINGING_SONG_ID(creature_ptr), SPELL_STOP);
 
        SINGING_SONG_EFFECT(creature_ptr) = MUSIC_NONE;
        SINGING_SONG_ID(creature_ptr) = 0;
@@ -291,68 +291,68 @@ bool_hack life_stream(player_type *creature_ptr, bool_hack message, bool_hack vi
        return TRUE;
 }
 
-bool_hack heroism(int base)
+bool_hack heroism(player_type *creature_ptr, int base)
 {
        bool_hack ident = FALSE;
-       if (set_afraid(p_ptr, 0)) ident = TRUE;
-       if (set_hero(p_ptr, p_ptr->hero + randint1(base) + base, FALSE)) ident = TRUE;
-       if (hp_player(p_ptr, 10)) ident = TRUE;
+       if (set_afraid(creature_ptr, 0)) ident = TRUE;
+       if (set_hero(creature_ptr, creature_ptr->hero + randint1(base) + base, FALSE)) ident = TRUE;
+       if (hp_player(creature_ptr, 10)) ident = TRUE;
        return ident;
 }
 
-bool_hack berserk(int base)
+bool_hack berserk(player_type *creature_ptr, int base)
 {
        bool_hack ident = FALSE;
-       if (set_afraid(p_ptr, 0)) ident = TRUE;
-       if (set_shero(p_ptr, p_ptr->shero + randint1(base) + base, FALSE)) ident = TRUE;
-       if (hp_player(p_ptr, 30)) ident = TRUE;
+       if (set_afraid(creature_ptr, 0)) ident = TRUE;
+       if (set_shero(creature_ptr, creature_ptr->shero + randint1(base) + base, FALSE)) ident = TRUE;
+       if (hp_player(creature_ptr, 30)) ident = TRUE;
        return ident;
 }
 
-bool_hack cure_light_wounds(DICE_NUMBER dice, DICE_SID sides)
+bool_hack cure_light_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides)
 {
        bool_hack ident = FALSE;
-       if (hp_player(p_ptr, damroll(dice, sides))) ident = TRUE;
-       if (set_blind(p_ptr, 0)) ident = TRUE;
-       if (set_cut(p_ptr,p_ptr->cut - 10)) ident = TRUE;
-       if (set_shero(p_ptr, 0, TRUE)) ident = TRUE;
+       if (hp_player(creature_ptr, damroll(dice, sides))) ident = TRUE;
+       if (set_blind(creature_ptr, 0)) ident = TRUE;
+       if (set_cut(creature_ptr,creature_ptr->cut - 10)) ident = TRUE;
+       if (set_shero(creature_ptr, 0, TRUE)) ident = TRUE;
        return ident;
 }
 
-bool_hack cure_serious_wounds(DICE_NUMBER dice, DICE_SID sides)
+bool_hack cure_serious_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides)
 {
        bool_hack ident = FALSE;
-       if (hp_player(p_ptr, damroll(dice, sides))) ident = TRUE;
-       if (set_blind(p_ptr, 0)) ident = TRUE;
-       if (set_confused(p_ptr, 0)) ident = TRUE;
-       if (set_cut(p_ptr,(p_ptr->cut / 2) - 50)) ident = TRUE;
-       if (set_shero(p_ptr, 0, TRUE)) ident = TRUE;
+       if (hp_player(creature_ptr, damroll(dice, sides))) ident = TRUE;
+       if (set_blind(creature_ptr, 0)) ident = TRUE;
+       if (set_confused(creature_ptr, 0)) ident = TRUE;
+       if (set_cut(creature_ptr,(creature_ptr->cut / 2) - 50)) ident = TRUE;
+       if (set_shero(creature_ptr, 0, TRUE)) ident = TRUE;
        return ident;
 }
 
-bool_hack cure_critical_wounds(HIT_POINT pow)
+bool_hack cure_critical_wounds(player_type *creature_ptr, HIT_POINT pow)
 {
        bool_hack ident = FALSE;
-       if (hp_player(p_ptr, pow)) ident = TRUE;
-       if (set_blind(p_ptr, 0)) ident = TRUE;
-       if (set_confused(p_ptr, 0)) ident = TRUE;
-       if (set_poisoned(p_ptr, 0)) ident = TRUE;
-       if (set_stun(p_ptr, 0)) ident = TRUE;
-       if (set_cut(p_ptr,0)) ident = TRUE;
-       if (set_shero(p_ptr, 0, TRUE)) ident = TRUE;
+       if (hp_player(creature_ptr, pow)) ident = TRUE;
+       if (set_blind(creature_ptr, 0)) ident = TRUE;
+       if (set_confused(creature_ptr, 0)) ident = TRUE;
+       if (set_poisoned(creature_ptr, 0)) ident = TRUE;
+       if (set_stun(creature_ptr, 0)) ident = TRUE;
+       if (set_cut(creature_ptr,0)) ident = TRUE;
+       if (set_shero(creature_ptr, 0, TRUE)) ident = TRUE;
        return ident;
 }
 
-bool_hack true_healing(HIT_POINT pow)
+bool_hack true_healing(player_type *creature_ptr, HIT_POINT pow)
 {
        bool_hack ident = FALSE;
-       if (hp_player(p_ptr, pow)) ident = TRUE;
-       if (set_blind(p_ptr, 0)) ident = TRUE;
-       if (set_confused(p_ptr, 0)) ident = TRUE;
-       if (set_poisoned(p_ptr, 0)) ident = TRUE;
-       if (set_stun(p_ptr, 0)) ident = TRUE;
-       if (set_cut(p_ptr,0)) ident = TRUE;
-       if (set_image(p_ptr, 0)) ident = TRUE;
+       if (hp_player(creature_ptr, pow)) ident = TRUE;
+       if (set_blind(creature_ptr, 0)) ident = TRUE;
+       if (set_confused(creature_ptr, 0)) ident = TRUE;
+       if (set_poisoned(creature_ptr, 0)) ident = TRUE;
+       if (set_stun(creature_ptr, 0)) ident = TRUE;
+       if (set_cut(creature_ptr,0)) ident = TRUE;
+       if (set_image(creature_ptr, 0)) ident = TRUE;
        return ident;
 }
 
@@ -518,7 +518,7 @@ void apply_nexus(monster_type *m_ptr)
                }
 
                msg_print(_("体がねじれ始めた...", "Your body starts to scramble..."));
-               status_shuffle();
+               status_shuffle(p_ptr);
                break;
        }
        }
@@ -528,7 +528,7 @@ void apply_nexus(monster_type *m_ptr)
  * @brief プレイヤーのステータスシャッフル処理
  * @return なし
  */
-void status_shuffle(void)
+void status_shuffle(player_type *creature_ptr)
 {
        BASE_STATUS max1, cur1, max2, cur2;
        int ii, jj, i;
@@ -537,21 +537,21 @@ void status_shuffle(void)
        ii = randint0(A_MAX);
        for (jj = ii; jj == ii; jj = randint0(A_MAX)) /* loop */;
 
-       max1 = p_ptr->stat_max[ii];
-       cur1 = p_ptr->stat_cur[ii];
-       max2 = p_ptr->stat_max[jj];
-       cur2 = p_ptr->stat_cur[jj];
+       max1 = creature_ptr->stat_max[ii];
+       cur1 = creature_ptr->stat_cur[ii];
+       max2 = creature_ptr->stat_max[jj];
+       cur2 = creature_ptr->stat_cur[jj];
 
-       p_ptr->stat_max[ii] = max2;
-       p_ptr->stat_cur[ii] = cur2;
-       p_ptr->stat_max[jj] = max1;
-       p_ptr->stat_cur[jj] = cur1;
+       creature_ptr->stat_max[ii] = max2;
+       creature_ptr->stat_cur[ii] = cur2;
+       creature_ptr->stat_max[jj] = max1;
+       creature_ptr->stat_cur[jj] = cur1;
 
        for (i = 0; i < A_MAX; i++)
        {
-               if (p_ptr->stat_max[i] > p_ptr->stat_max_max[i]) p_ptr->stat_max[i] = p_ptr->stat_max_max[i];
-               if (p_ptr->stat_cur[i] > p_ptr->stat_max_max[i]) p_ptr->stat_cur[i] = p_ptr->stat_max_max[i];
+               if (creature_ptr->stat_max[i] > creature_ptr->stat_max_max[i]) creature_ptr->stat_max[i] = creature_ptr->stat_max_max[i];
+               if (creature_ptr->stat_cur[i] > creature_ptr->stat_max_max[i]) creature_ptr->stat_cur[i] = creature_ptr->stat_max_max[i];
        }
 
-       p_ptr->update |= (PU_BONUS);
+       creature_ptr->update |= (PU_BONUS);
 }