[Refactor] #38997 hypodynamic_bolt() にplayer_type * 引数を追加 / Added player_type * argum...

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 2157611..5ff13c0 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -858,7 +858,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
        {
                msg_format(_("あなたは%sに敵を締め殺すよう命じた。", "You order the %s to strangle your opponent."), name);
                if (!get_aim_dir(&dir)) return FALSE;
-               if (hypodynamic_bolt(dir, 100))
+               if (hypodynamic_bolt(user_ptr, dir, 100))
                        break;
        }
 
@@ -866,7 +866,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
        {
                msg_print(_("黒く輝いている...", "It glows black..."));
                if (!get_aim_dir(&dir)) return FALSE;
-               hypodynamic_bolt(dir, 120);
+               hypodynamic_bolt(user_ptr, dir, 120);
                break;
        }
 
@@ -875,7 +875,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
                if (!get_aim_dir(&dir)) return FALSE;
                for (dummy = 0; dummy < 3; dummy++)
                {
-                       if (hypodynamic_bolt(dir, 50))
+                       if (hypodynamic_bolt(user_ptr, dir, 50))
                                hp_player(user_ptr, 50);
                }
                break;
@@ -900,7 +900,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
                if (!get_aim_dir(&dir)) return FALSE;
                for (dummy = 0; dummy < 3; dummy++)
                {
-                       if (hypodynamic_bolt(dir, 100))
+                       if (hypodynamic_bolt(user_ptr, dir, 100))
                                hp_player(user_ptr, 100);
                }
                break;

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index e8c437e..d801722 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -167,7 +167,7 @@ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION d
 
        case SV_ROD_HYPODYNAMIA:
        {
-               if (hypodynamic_bolt(dir, 70 + 3 * lev / 2)) ident = TRUE;
+               if (hypodynamic_bolt(creature_ptr, dir, 70 + 3 * lev / 2)) ident = TRUE;
                break;
        }
 

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index b51a09c..8989746 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -138,7 +138,7 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION
 
                case SV_WAND_HYPODYNAMIA:
                {
-                       if (hypodynamic_bolt(dir, 80 + lev)) ident = TRUE;
+                       if (hypodynamic_bolt(creature_ptr, dir, 80 + lev)) ident = TRUE;
                        break;
                }
 

diff --git a/src/realm-death.c b/src/realm-death.c
index be6a544..81aa793 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -309,7 +309,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               if (hypodynamic_bolt(dir, dam))
+                               if (hypodynamic_bolt(caster_ptr, dir, dam))
                                {
                                        chg_virtue(caster_ptr, V_SACRIFICE, -1);
                                        chg_virtue(caster_ptr, V_VITALITY, -1);
@@ -469,7 +469,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                                for (i = 0; i < 3; i++)
                                {
-                                       if (hypodynamic_bolt(dir, dam))
+                                       if (hypodynamic_bolt(caster_ptr, dir, dam))
                                                hp_player(caster_ptr, dam);
                                }
                        }

diff --git a/src/spells.h b/src/spells.h
index 86eba55..df45b3d 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -208,7 +208,7 @@ 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(player_type *caster_ptr, PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
 extern bool lite_line(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
-extern bool hypodynamic_bolt(DIRECTION dir, HIT_POINT dam);
+extern bool hypodynamic_bolt(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
 extern bool death_ray(DIRECTION dir, PLAYER_LEVEL plev);
 extern bool wall_to_mud(DIRECTION dir, HIT_POINT dam);
 extern bool destroy_door(DIRECTION dir);

diff --git a/src/spells2.c b/src/spells2.c
index a3a2f8a..3923751 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2418,10 +2418,10 @@ bool lite_line(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam)
  * @param dam 威力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool hypodynamic_bolt(DIRECTION dir, HIT_POINT dam)
+bool hypodynamic_bolt(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       return (project_hook(p_ptr, GF_HYPODYNAMIA, dir, dam, flg));
+       return (project_hook(caster_ptr, GF_HYPODYNAMIA, dir, dam, flg));
 }
 
 
@@ -3660,12 +3660,12 @@ void cast_wonder(player_type *caster_ptr, DIRECTION dir)
        else if (die < 71)
                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 < 76) hypodynamic_bolt(caster_ptr, dir, 75);
        else if (die < 81) fire_ball(caster_ptr, GF_ELEC, dir, 30 + plev / 2, 2);
        else if (die < 86) fire_ball(caster_ptr, GF_ACID, dir, 40 + plev, 2);
        else if (die < 91) fire_ball(caster_ptr, GF_ICE, dir, 70 + plev, 3);
        else if (die < 96) fire_ball(caster_ptr, GF_FIRE, dir, 80 + plev, 3);
-       else if (die < 101) hypodynamic_bolt(dir, 100 + plev);
+       else if (die < 101) hypodynamic_bolt(caster_ptr, dir, 100 + plev);
        else if (die < 104)
        {
                earthquake(caster_ptr, caster_ptr->y, caster_ptr->x, 12, 0);
@@ -3789,7 +3789,7 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir)
        }
        else if (die < 76)
        {
-               hypodynamic_bolt(dir, 75);
+               hypodynamic_bolt(caster_ptr, dir, 75);
        }
        else if (die < 81)
        {
@@ -3809,7 +3809,7 @@ void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir)
        }
        else if (die < 101)
        {
-               hypodynamic_bolt(dir, 100 + plev);
+               hypodynamic_bolt(caster_ptr, dir, 100 + plev);
        }
        else if (die < 104)
        {
@@ -4061,7 +4061,7 @@ bool_hack vampirism(player_type *caster_ptr)
 
        dummy = caster_ptr->lev * 2;
 
-       if (hypodynamic_bolt(dir, dummy))
+       if (hypodynamic_bolt(caster_ptr, dir, dummy))
        {
                if (caster_ptr->food < PY_FOOD_FULL)
                        /* No heal if we are "full" */