From cd1391259ced7e2ef82ddc065b19f8a4b89e1f5e Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 12 Sep 2019 19:14:51 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20berserk()=20=E3=81=AB=20pl?= =?utf8?q?ayer=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0?= =?utf8?q?=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argument=20to=20berser?= =?utf8?q?k().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-activate.c | 2 +- src/cmd/cmd-quaff.c | 2 +- src/mutation.c | 2 +- src/racial.c | 4 ++-- src/realm-craft.c | 2 +- src/realm-death.c | 4 ++-- src/spells-status.c | 8 ++++---- src/spells-status.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index 54c98189e..522675bb4 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -1311,7 +1311,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) case ACT_BERSERK: { - (void)berserk(randint1(25) + 25); + (void)berserk(p_ptr, randint1(25) + 25); break; } diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c index 49d7d0758..306bc324b 100644 --- a/src/cmd/cmd-quaff.c +++ b/src/cmd/cmd-quaff.c @@ -300,7 +300,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item) break; case SV_POTION_BESERK_STRENGTH: - ident = berserk(randint1(25) + 25); + ident = berserk(p_ptr, randint1(25) + 25); break; case SV_POTION_CURE_LIGHT: diff --git a/src/mutation.c b/src/mutation.c index 35bd8c7b9..4af46923d 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -2195,7 +2195,7 @@ bool exe_mutation_power(player_type *creature_ptr, int power) break; case MUT1_BERSERK: - (void)berserk(randint1(25) + 25); + (void)berserk(p_ptr, randint1(25) + 25); break; case MUT1_POLYMORPH: diff --git a/src/racial.c b/src/racial.c index cd0688847..a0643c27b 100644 --- a/src/racial.c +++ b/src/racial.c @@ -670,7 +670,7 @@ static bool exe_racial_power(player_type *creature_ptr, s32b command) case RACE_HALF_TROLL: msg_print(_("うがぁぁ！", "RAAAGH!")); - (void)berserk(10 + randint1(plev)); + (void)berserk(p_ptr, 10 + randint1(plev)); break; case RACE_AMBERITE: @@ -691,7 +691,7 @@ static bool exe_racial_power(player_type *creature_ptr, s32b command) case RACE_BARBARIAN: msg_print(_("うぉぉおお！", "Raaagh!")); - (void)berserk(10 + randint1(plev)); + (void)berserk(p_ptr, 10 + randint1(plev)); break; case RACE_HALF_OGRE: diff --git a/src/realm-craft.c b/src/realm-craft.c index 0e880915a..fb5109629 100644 --- a/src/realm-craft.c +++ b/src/realm-craft.c @@ -211,7 +211,7 @@ concptr do_craft_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (cast) { - (void)berserk(base + randint1(base)); + (void)berserk(p_ptr, base + randint1(base)); } } break; diff --git a/src/realm-death.c b/src/realm-death.c index 335361468..652cb236b 100644 --- a/src/realm-death.c +++ b/src/realm-death.c @@ -376,7 +376,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (cast) { - (void)berserk(base + randint1(base)); + (void)berserk(p_ptr, base + randint1(base)); } } break; @@ -430,7 +430,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (cast) { - (void)berserk(b_base + randint1(b_base)); + (void)berserk(p_ptr, b_base + randint1(b_base)); set_fast(caster_ptr, randint1(sp_sides) + sp_base, FALSE); } } diff --git a/src/spells-status.c b/src/spells-status.c index a144f007f..8794dbc97 100644 --- a/src/spells-status.c +++ b/src/spells-status.c @@ -300,12 +300,12 @@ bool_hack heroism(player_type *creature_ptr, int base) 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; } diff --git a/src/spells-status.h b/src/spells-status.h index c826c6db7..fbadd4d1b 100644 --- a/src/spells-status.h +++ b/src/spells-status.h @@ -15,7 +15,7 @@ extern bool time_walk(player_type *creature_ptr); extern void roll_hitdice(player_type *creature_ptr, SPOP_FLAGS options); extern bool_hack life_stream(player_type *creature_ptr, bool_hack message, bool_hack virtue_change); extern bool_hack heroism(player_type *creature_ptr, int base); -extern bool_hack berserk(int base); +extern bool_hack berserk(player_type *creature_ptr, int base); extern bool_hack cure_light_wounds(DICE_NUMBER dice, DICE_SID sides); extern bool_hack cure_serious_wounds(DICE_NUMBER dice, DICE_SID sides); extern bool_hack cure_critical_wounds(HIT_POINT pow); -- 2.11.0