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

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index f8d9768..f071a52 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -505,7 +505,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 
                        if (cast)
                        {
-                               if (!cast_wrath_of_the_god(dam, rad)) return NULL;
+                               if (!cast_wrath_of_the_god(caster_ptr, dam, rad)) return NULL;
                        }
                }
                break;

diff --git a/src/spells.h b/src/spells.h
index 442de3b..e876313 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -251,7 +251,7 @@ extern void remove_all_mirrors(bool explode);
 extern void ring_of_power(player_type *caster_ptr, DIRECTION dir);
 extern void wild_magic(player_type *caster_ptr, int spell);
 extern void cast_meteor(HIT_POINT dam, POSITION rad);
-extern bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad);
+extern bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad);
 extern void cast_wonder(DIRECTION dir);
 extern void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir);
 extern void cast_shuffle(player_type *caster_ptr);

diff --git a/src/spells2.c b/src/spells2.c
index 3930f2f..d28507f 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3342,7 +3342,7 @@ void cast_meteor(HIT_POINT dam, POSITION rad)
 * @param rad 効力の半径
 * @return ターゲットを指定し、実行したならばTRUEを返す。
 */
-bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
+bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad)
 {
        POSITION x, y, tx, ty;
        POSITION nx, ny;
@@ -3353,8 +3353,8 @@ bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
        if (!get_aim_dir(&dir)) return FALSE;
 
        /* Use the given direction */
-       tx = p_ptr->x + 99 * ddx[dir];
-       ty = p_ptr->y + 99 * ddy[dir];
+       tx = caster_ptr->x + 99 * ddx[dir];
+       ty = caster_ptr->y + 99 * ddy[dir];
 
        /* Hack -- Use an actual "target" */
        if ((dir == 5) && target_okay())
@@ -3363,8 +3363,8 @@ bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
                ty = target_row;
        }
 
-       x = p_ptr->x;
-       y = p_ptr->y;
+       x = caster_ptr->x;
+       y = caster_ptr->y;
 
        while (1)
        {
@@ -3373,16 +3373,16 @@ bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
 
                ny = y;
                nx = x;
-               mmove2(&ny, &nx, p_ptr->y, p_ptr->x, ty, tx);
+               mmove2(&ny, &nx, caster_ptr->y, caster_ptr->x, ty, tx);
 
                /* Stop at maximum range */
-               if (MAX_RANGE <= distance(p_ptr->y, p_ptr->x, ny, nx)) break;
+               if (MAX_RANGE <= distance(caster_ptr->y, caster_ptr->x, ny, nx)) break;
 
                /* Stopped by walls/doors */
                if (!cave_have_flag_bold(ny, nx, FF_PROJECT)) break;
 
                /* Stopped by monsters */
-               if ((dir != 5) && p_ptr->current_floor_ptr->grid_array[ny][nx].m_idx != 0) break;
+               if ((dir != 5) && caster_ptr->current_floor_ptr->grid_array[ny][nx].m_idx != 0) break;
 
                /* Save the new location */
                x = nx;
@@ -3414,7 +3414,7 @@ bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
                if (count < 0) continue;
 
                /* Cannot penetrate perm walls */
-               if (!in_bounds(p_ptr->current_floor_ptr, y, x) ||
+               if (!in_bounds(caster_ptr->current_floor_ptr, y, x) ||
                        cave_stop_disintegration(y, x) ||
                        !in_disintegration_range(ty, tx, y, x))
                        continue;