From d79ac6a8e0305bc3b6b70be6253b76f2c5858f11 Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 6 Jan 2020 22:48:57 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20fire=5Fbolt=5For=5Fbeam()?= =?utf8?q?=20=E3=81=ABplayer=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=20/=20Added=20player=5Ftype=20*=20argument=20?= =?utf8?q?to=20fire=5Fbolt=5For=5Fbeam()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-zaprod.c | 8 ++++---- src/cmd/cmd-zapwand.c | 9 +++++---- src/racial.c | 2 +- src/realm-arcane.c | 2 +- src/realm-chaos.c | 6 +++--- src/realm-crusade.c | 2 +- src/realm-daemon.c | 6 +++--- src/realm-death.c | 4 ++-- src/realm-nature.c | 4 ++-- src/spells.h | 2 +- src/spells2.c | 26 +++++++++++++------------- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c index 4b2b3e83d..cc7e78b01 100644 --- a/src/cmd/cmd-zaprod.c +++ b/src/cmd/cmd-zaprod.c @@ -179,28 +179,28 @@ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION d case SV_ROD_ACID_BOLT: { - fire_bolt_or_beam(10, GF_ACID, dir, damroll(6 + lev / 7, 8)); + fire_bolt_or_beam(creature_ptr, 10, GF_ACID, dir, damroll(6 + lev / 7, 8)); ident = TRUE; break; } case SV_ROD_ELEC_BOLT: { - fire_bolt_or_beam(10, GF_ELEC, dir, damroll(4 + lev / 9, 8)); + fire_bolt_or_beam(creature_ptr, 10, GF_ELEC, dir, damroll(4 + lev / 9, 8)); ident = TRUE; break; } case SV_ROD_FIRE_BOLT: { - fire_bolt_or_beam(10, GF_FIRE, dir, damroll(7 + lev / 6, 8)); + fire_bolt_or_beam(creature_ptr, 10, GF_FIRE, dir, damroll(7 + lev / 6, 8)); ident = TRUE; break; } case SV_ROD_COLD_BOLT: { - fire_bolt_or_beam(10, GF_COLD, dir, damroll(5 + lev / 8, 8)); + fire_bolt_or_beam(creature_ptr, 10, GF_COLD, dir, damroll(5 + lev / 8, 8)); ident = TRUE; break; } diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c index 9d02f84ed..af2cc5f23 100644 --- a/src/cmd/cmd-zapwand.c +++ b/src/cmd/cmd-zapwand.c @@ -17,6 +17,7 @@ /*! * @brief 魔法棒の効果を発動する +* @param creature_ptr プレーヤーへの参照ポインタ * @param sval オブジェクトのsval * @param dir 発動の方向ID * @param powerful 強力発動上の処理ならばTRUE @@ -156,14 +157,14 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION case SV_WAND_MAGIC_MISSILE: { - fire_bolt_or_beam(20, GF_MISSILE, dir, damroll(2 + lev / 10, 6)); + fire_bolt_or_beam(creature_ptr, 20, GF_MISSILE, dir, damroll(2 + lev / 10, 6)); ident = TRUE; break; } case SV_WAND_ACID_BOLT: { - fire_bolt_or_beam(20, GF_ACID, dir, damroll(6 + lev / 7, 8)); + fire_bolt_or_beam(creature_ptr, 20, GF_ACID, dir, damroll(6 + lev / 7, 8)); ident = TRUE; break; } @@ -177,14 +178,14 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION case SV_WAND_FIRE_BOLT: { - fire_bolt_or_beam(20, GF_FIRE, dir, damroll(7 + lev / 6, 8)); + fire_bolt_or_beam(creature_ptr, 20, GF_FIRE, dir, damroll(7 + lev / 6, 8)); ident = TRUE; break; } case SV_WAND_COLD_BOLT: { - fire_bolt_or_beam(20, GF_COLD, dir, damroll(5 + lev / 8, 8)); + fire_bolt_or_beam(creature_ptr, 20, GF_COLD, dir, damroll(5 + lev / 8, 8)); ident = TRUE; break; } diff --git a/src/racial.c b/src/racial.c index 402b71749..f5c6a089a 100644 --- a/src/racial.c +++ b/src/racial.c @@ -747,7 +747,7 @@ static bool exe_racial_power(player_type *creature_ptr, s32b command) case RACE_DARK_ELF: if (!get_aim_dir(&dir)) return FALSE; msg_print(_("マジック・ミサイルを放った。", "You cast a magic missile.")); - fire_bolt_or_beam(10, GF_MISSILE, dir, damroll(3 + ((plev - 1) / 5), 4)); + fire_bolt_or_beam(creature_ptr, 10, GF_MISSILE, dir, damroll(3 + ((plev - 1) / 5), 4)); break; case RACE_DRACONIAN: diff --git a/src/realm-arcane.c b/src/realm-arcane.c index 793bbedb0..1f23e731b 100644 --- a/src/realm-arcane.c +++ b/src/realm-arcane.c @@ -46,7 +46,7 @@ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(dice, sides)); } } break; diff --git a/src/realm-chaos.c b/src/realm-chaos.c index efc053aec..001ccfd71 100644 --- a/src/realm-chaos.c +++ b/src/realm-chaos.c @@ -45,7 +45,7 @@ concptr do_chaos_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides)); } } break; @@ -148,7 +148,7 @@ concptr do_chaos_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_FIRE, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_FIRE, dir, damroll(dice, sides)); } } break; @@ -219,7 +219,7 @@ concptr do_chaos_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_CHAOS, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_CHAOS, dir, damroll(dice, sides)); } } break; diff --git a/src/realm-crusade.c b/src/realm-crusade.c index e496b2017..d1a2a5b4a 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -44,7 +44,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod if (cast) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(dice, sides)); } } break; diff --git a/src/realm-daemon.c b/src/realm-daemon.c index c9304e44c..5163d0b9e 100644 --- a/src/realm-daemon.c +++ b/src/realm-daemon.c @@ -47,7 +47,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides)); } } break; @@ -134,7 +134,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides)); } } break; @@ -246,7 +246,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_PLASMA, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_PLASMA, dir, damroll(dice, sides)); } } break; diff --git a/src/realm-death.c b/src/realm-death.c index da3607bf0..be6a54427 100644 --- a/src/realm-death.c +++ b/src/realm-death.c @@ -239,7 +239,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides)); } } break; @@ -412,7 +412,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr), GF_DARK, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_DARK, dir, damroll(dice, sides)); } } break; diff --git a/src/realm-nature.c b/src/realm-nature.c index dcbc50936..b0d1a49f0 100644 --- a/src/realm-nature.c +++ b/src/realm-nature.c @@ -221,7 +221,7 @@ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode if (cast) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_COLD, dir, damroll(dice, sides)); } } break; @@ -261,7 +261,7 @@ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode if (cast) { if (!get_aim_dir(&dir)) return NULL; - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_FIRE, dir, damroll(dice, sides)); + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_FIRE, dir, damroll(dice, sides)); } } break; diff --git a/src/spells.h b/src/spells.h index edf17b3c4..b6bbb5a30 100644 --- a/src/spells.h +++ b/src/spells.h @@ -206,7 +206,7 @@ extern bool fire_bolt(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT extern bool fire_blast(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, DICE_NUMBER dd, DICE_SID ds, int num, int dev); extern void call_chaos(player_type *caster_ptr); extern bool fire_beam(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); -extern bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); +extern bool fire_bolt_or_beam(player_type *caster_ptr, PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); extern bool lite_line(DIRECTION dir, HIT_POINT dam); extern bool hypodynamic_bolt(DIRECTION dir, HIT_POINT dam); extern bool death_ray(DIRECTION dir, PLAYER_LEVEL plev); diff --git a/src/spells2.c b/src/spells2.c index cf837966a..ef83b1cb8 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -2377,15 +2377,15 @@ bool fire_beam(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT * Affect monsters, grids and objects. * */ -bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam) +bool fire_bolt_or_beam(player_type *caster_ptr, PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam) { if (randint0(100) < prob) { - return (fire_beam(p_ptr, typ, dir, dam)); + return (fire_beam(caster_ptr, typ, dir, dam)); } else { - return (fire_bolt(p_ptr, typ, dir, dam)); + return (fire_bolt(caster_ptr, typ, dir, dam)); } } @@ -3636,22 +3636,22 @@ void cast_wonder(player_type *caster_ptr, DIRECTION dir) else if (die < 26) heal_monster(dir, damroll(4, 6)); else if (die < 31) poly_monster(dir, plev); else if (die < 36) - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(3 + ((plev - 1) / 5), 4)); else if (die < 41) confuse_monster(dir, plev); else if (die < 46) fire_ball(caster_ptr, GF_POIS, dir, 20 + (plev / 2), 3); else if (die < 51) (void)lite_line(dir, damroll(6, 8)); else if (die < 56) - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(3 + ((plev - 5) / 4), 8)); else if (die < 61) - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_COLD, dir, damroll(5 + ((plev - 5) / 4), 8)); else if (die < 66) - fire_bolt_or_beam(beam_chance(caster_ptr), GF_ACID, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_ACID, dir, damroll(6 + ((plev - 5) / 4), 8)); else if (die < 71) - fire_bolt_or_beam(beam_chance(caster_ptr), GF_FIRE, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_FIRE, dir, damroll(8 + ((plev - 5) / 4), 8)); else if (die < 76) hypodynamic_bolt(dir, 75); else if (die < 81) fire_ball(caster_ptr, GF_ELEC, dir, 30 + plev / 2, 2); @@ -3745,7 +3745,7 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir) } else if (die < 36) { - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(3 + ((plev - 1) / 5), 4)); } else if (die < 41) @@ -3762,22 +3762,22 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir) } else if (die < 56) { - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_ELEC, dir, damroll(3 + ((plev - 5) / 4), 8)); } else if (die < 61) { - fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr) - 10, GF_COLD, dir, damroll(5 + ((plev - 5) / 4), 8)); } else if (die < 66) { - fire_bolt_or_beam(beam_chance(caster_ptr), GF_ACID, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_ACID, dir, damroll(6 + ((plev - 5) / 4), 8)); } else if (die < 71) { - fire_bolt_or_beam(beam_chance(caster_ptr), GF_FIRE, dir, + fire_bolt_or_beam(caster_ptr, beam_chance(caster_ptr), GF_FIRE, dir, damroll(8 + ((plev - 5) / 4), 8)); } else if (die < 76) -- 2.11.0