[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 5ef66ed..8bdcf6f 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -291,55 +291,55 @@ 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;
 }