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

diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index cc64cbd..ea93cae 100644 (file)
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -45,7 +45,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() - 10, GF_ELEC, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(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 87773d4..8490b1c 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -44,7 +44,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() - 10, GF_MISSILE, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -147,7 +147,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(), GF_FIRE, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_FIRE, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -218,7 +218,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(), GF_CHAOS, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_CHAOS, dir, damroll(dice, sides));
                        }
                }
                break;

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index 16da24e..86a547f 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -43,7 +43,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() - 10, GF_ELEC, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(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 df1b2a0..85419b4 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -46,7 +46,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() - 10, GF_MISSILE, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -133,7 +133,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(), GF_NETHER, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -245,7 +245,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(), GF_PLASMA, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_PLASMA, dir, damroll(dice, sides));
                        }
                }
                break;

diff --git a/src/realm-death.c b/src/realm-death.c
index 6969a9a..8b70a73 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -238,7 +238,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(), GF_NETHER, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_NETHER, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -411,7 +411,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(), GF_DARK, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr), GF_DARK, dir, damroll(dice, sides));
                        }
                }
                break;

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 6c92d9a..bbf16fc 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -220,7 +220,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() - 10, GF_COLD, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir, damroll(dice, sides));
                        }
                }
                break;
@@ -260,7 +260,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() - 10, GF_FIRE, dir, damroll(dice, sides));
+                               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_FIRE, dir, damroll(dice, sides));
                        }
                }
                break;

diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c
index 746b466..a0c1cfe 100644 (file)
--- a/src/spells-diceroll.c
+++ b/src/spells-diceroll.c
@@ -74,12 +74,12 @@ bool_hack common_saving_throw_control(player_type *operator_ptr, HIT_POINT pow,
 * ハードコーティングによる実装が行われている。
 * メイジは(レベル)%、ハイメイジ、スペルマスターは(レベル)%、それ以外の職業は(レベル/2)%
 */
-PERCENTAGE beam_chance(void)
+PERCENTAGE beam_chance(player_type *caster_ptr)
 {
-       if (p_ptr->pclass == CLASS_MAGE)
-               return (PERCENTAGE)(p_ptr->lev);
-       if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
-               return (PERCENTAGE)(p_ptr->lev + 10);
+       if (caster_ptr->pclass == CLASS_MAGE)
+               return (PERCENTAGE)(caster_ptr->lev);
+       if (caster_ptr->pclass == CLASS_HIGH_MAGE || caster_ptr->pclass == CLASS_SORCERER)
+               return (PERCENTAGE)(caster_ptr->lev + 10);
 
-       return (PERCENTAGE)(p_ptr->lev / 2);
+       return (PERCENTAGE)(caster_ptr->lev / 2);
 }

diff --git a/src/spells.h b/src/spells.h
index 1e99fc7..25198e1 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -141,7 +141,7 @@ extern bool sukekaku;
 extern const magic_type technic_info[NUM_TECHNIC][32];
 
 /* spells1.c */
-extern PERCENTAGE beam_chance(void);
+extern PERCENTAGE beam_chance(player_type *caster_ptr);
 extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ);
 extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);

diff --git a/src/spells2.c b/src/spells2.c
index 724d39b..6c8958f 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3467,22 +3467,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() - 10, GF_MISSILE, dir,
+               fire_bolt_or_beam(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() - 10, GF_ELEC, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir,
                        damroll(3 + ((plev - 5) / 4), 8));
        else if (die < 61)
-               fire_bolt_or_beam(beam_chance() - 10, GF_COLD, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir,
                        damroll(5 + ((plev - 5) / 4), 8));
        else if (die < 66)
-               fire_bolt_or_beam(beam_chance(), GF_ACID, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr), GF_ACID, dir,
                        damroll(6 + ((plev - 5) / 4), 8));
        else if (die < 71)
-               fire_bolt_or_beam(beam_chance(), GF_FIRE, dir,
+               fire_bolt_or_beam(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);
@@ -3572,7 +3572,7 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir)
        }
        else if (die < 36)
        {
-               fire_bolt_or_beam(beam_chance() - 10, GF_MISSILE, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_MISSILE, dir,
                        damroll(3 + ((plev - 1) / 5), 4));
        }
        else if (die < 41)
@@ -3589,22 +3589,22 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir)
        }
        else if (die < 56)
        {
-               fire_bolt_or_beam(beam_chance() - 10, GF_ELEC, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_ELEC, dir,
                        damroll(3 + ((plev - 5) / 4), 8));
        }
        else if (die < 61)
        {
-               fire_bolt_or_beam(beam_chance() - 10, GF_COLD, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr) - 10, GF_COLD, dir,
                        damroll(5 + ((plev - 5) / 4), 8));
        }
        else if (die < 66)
        {
-               fire_bolt_or_beam(beam_chance(), GF_ACID, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr), GF_ACID, dir,
                        damroll(6 + ((plev - 5) / 4), 8));
        }
        else if (die < 71)
        {
-               fire_bolt_or_beam(beam_chance(), GF_FIRE, dir,
+               fire_bolt_or_beam(beam_chance(caster_ptr), GF_FIRE, dir,
                        damroll(8 + ((plev - 5) / 4), 8));
        }
        else if (die < 76)