[Fix] #38997 do_hissatsu_spell() 変数参照修正． / Fix variable reference of do_hissatsu_spell().

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 5a9e006..00f5816 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -72,22 +72,22 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
                        y = caster_ptr->y + ddy_cdd[cdir];
                        x = caster_ptr->x + ddx_cdd[cdir];
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, 0);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
 
                        y = caster_ptr->y + ddy_cdd[(cdir + 7) % 8];
                        x = caster_ptr->x + ddx_cdd[(cdir + 7) % 8];
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, 0);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
 
                        y = caster_ptr->y + ddy_cdd[(cdir + 1) % 8];
                        x = caster_ptr->x + ddx_cdd[(cdir + 1) % 8];
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, 0);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
                }
@@ -118,8 +118,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_FIRE);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_FIRE);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -152,8 +152,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_MINEUCHI);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_MINEUCHI);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -200,21 +200,21 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (!p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                       if (!caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
                                return NULL;
                        }
 
-                       py_attack(p_ptr, y, x, 0);
+                       py_attack(caster_ptr, y, x, 0);
 
-                       if (!player_can_enter(p_ptr->current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(p_ptr->current_floor_ptr->grid_array[y][x].feat))
+                       if (!player_can_enter(caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(caster_ptr->current_floor_ptr->grid_array[y][x].feat))
                                break;
 
                        y += ddy[dir];
                        x += ddx[dir];
 
-                       if (player_can_enter(p_ptr->current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(p_ptr->current_floor_ptr->grid_array[y][x].feat) && !p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                       if (player_can_enter(caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(caster_ptr->current_floor_ptr->grid_array[y][x].feat) && !caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                msg_print(NULL);
                                (void)move_player_effect(caster_ptr, y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
@@ -236,8 +236,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_POISON);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_POISON);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -261,8 +261,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_ZANMA);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_ZANMA);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -285,8 +285,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, 0);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, 0);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -296,13 +296,13 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        {
                                return "";
                        }
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                int i;
                                POSITION ty = y, tx = x;
                                POSITION oy = y, ox = x;
-                               MONSTER_IDX m_idx = p_ptr->current_floor_ptr->grid_array[y][x].m_idx;
-                               monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[m_idx];
+                               MONSTER_IDX m_idx = caster_ptr->current_floor_ptr->grid_array[y][x].m_idx;
+                               monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
                                GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, 0);
@@ -321,8 +321,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                if ((ty != oy) || (tx != ox))
                                {
                                        msg_format(_("%sを吹き飛ばした！", "You blow %s away!"), m_name);
-                                       p_ptr->current_floor_ptr->grid_array[oy][ox].m_idx = 0;
-                                       p_ptr->current_floor_ptr->grid_array[ty][tx].m_idx = m_idx;
+                                       caster_ptr->current_floor_ptr->grid_array[oy][ox].m_idx = 0;
+                                       caster_ptr->current_floor_ptr->grid_array[ty][tx].m_idx = m_idx;
                                        m_ptr->fy = ty;
                                        m_ptr->fx = tx;
 
@@ -369,8 +369,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_HAGAN);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_HAGAN);
 
                        if (!cave_have_flag_bold(y, x, FF_HURT_ROCK)) break;
 
@@ -395,8 +395,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_COLD);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_COLD);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -420,8 +420,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_KYUSHO);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_KYUSHO);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -445,8 +445,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_MAJIN);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_MAJIN);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -470,8 +470,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_SUTEMI);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_SUTEMI);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -496,8 +496,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_ELEC);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_ELEC);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -537,8 +537,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        {
                                y = caster_ptr->y + ddy_ddd[dir];
                                x = caster_ptr->x + ddx_ddd[dir];
-                               g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x];
-                               m_ptr = &p_ptr->current_floor_ptr->m_list[g_ptr->m_idx];
+                               g_ptr = &caster_ptr->current_floor_ptr->grid_array[y][x];
+                               m_ptr = &caster_ptr->current_floor_ptr->m_list[g_ptr->m_idx];
 
                                /* Hack -- attack monsters */
                                if (g_ptr->m_idx && (m_ptr->ml || cave_have_flag_bold(y, x, FF_PROJECT)))
@@ -550,7 +550,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                                monster_desc(m_name, m_ptr, 0);
                                                msg_format(_("%sには効果がない！", "%s is unharmed!"), m_name);
                                        }
-                                       else py_attack(p_ptr, y, x, HISSATSU_SEKIRYUKA);
+                                       else py_attack(caster_ptr, y, x, HISSATSU_SEKIRYUKA);
                                }
                        }
                }
@@ -570,8 +570,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_QUAKE);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_QUAKE);
                        else
                                earthquake(caster_ptr, caster_ptr->y, caster_ptr->x, 10, 0);
                }
@@ -652,10 +652,10 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
                                y = caster_ptr->y + ddy[dir];
                                x = caster_ptr->x + ddx[dir];
-                               g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x];
+                               g_ptr = &caster_ptr->current_floor_ptr->grid_array[y][x];
 
                                if (g_ptr->m_idx)
-                                       py_attack(p_ptr, y, x, HISSATSU_3DAN);
+                                       py_attack(caster_ptr, y, x, HISSATSU_3DAN);
                                else
                                {
                                        msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -673,7 +673,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                ny = y + ddy[dir];
                                nx = x + ddx[dir];
                                m_idx = g_ptr->m_idx;
-                               m_ptr = &p_ptr->current_floor_ptr->m_list[m_idx];
+                               m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
 
                                /* Monster cannot move back? */
                                if (!monster_can_enter(ny, nx, &r_info[m_ptr->r_idx], 0))
@@ -684,7 +684,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                }
 
                                g_ptr->m_idx = 0;
-                               p_ptr->current_floor_ptr->grid_array[ny][nx].m_idx = m_idx;
+                               caster_ptr->current_floor_ptr->grid_array[ny][nx].m_idx = m_idx;
                                m_ptr->fy = ny;
                                m_ptr->fx = nx;
 
@@ -727,8 +727,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_DRAIN);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_DRAIN);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
@@ -828,13 +828,13 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                        {
-                               py_attack(p_ptr, y, x, 0);
-                               if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, 0);
+                               if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                                {
                                        handle_stuff();
-                                       py_attack(p_ptr, y, x, 0);
+                                       py_attack(caster_ptr, y, x, 0);
                                }
                        }
                        else
@@ -912,8 +912,8 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                        y = caster_ptr->y + ddy[dir];
                        x = caster_ptr->x + ddx[dir];
 
-                       if (p_ptr->current_floor_ptr->grid_array[y][x].m_idx)
-                               py_attack(p_ptr, y, x, HISSATSU_UNDEAD);
+                       if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                               py_attack(caster_ptr, y, x, HISSATSU_UNDEAD);
                        else
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));