[Refactor] #38993 m_list と max_m_idx を floor_type に取り込む。 / Move m_list and max_m_idx...

[hengband/hengband.git] / src / realm-hissatsu.c

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 00ecac6..e4534ea 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -58,21 +58,21 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        y = p_ptr->y + ddy_cdd[cdir];
                        x = p_ptr->x + ddx_cdd[cdir];
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
 
                        y = p_ptr->y + ddy_cdd[(cdir + 7) % 8];
                        x = p_ptr->x + ddx_cdd[(cdir + 7) % 8];
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
 
                        y = p_ptr->y + ddy_cdd[(cdir + 1) % 8];
                        x = p_ptr->x + ddx_cdd[(cdir + 1) % 8];
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, 0);
                        else
                                msg_print(_("攻撃は空を切った。", "You attack the empty air."));
@@ -104,7 +104,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_FIRE);
                        else
                        {
@@ -138,7 +138,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_MINEUCHI);
                        else
                        {
@@ -186,7 +186,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (!current_floor->grid_array[y][x].m_idx)
+                       if (!current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                msg_print(_("その方向にはモンスターはいません。", "There is no monster."));
                                return NULL;
@@ -194,13 +194,13 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        py_attack(y, x, 0);
 
-                       if (!player_can_enter(current_floor->grid_array[y][x].feat, 0) || is_trap(current_floor->grid_array[y][x].feat))
+                       if (!player_can_enter(current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(current_floor_ptr->grid_array[y][x].feat))
                                break;
 
                        y += ddy[dir];
                        x += ddx[dir];
 
-                       if (player_can_enter(current_floor->grid_array[y][x].feat, 0) && !is_trap(current_floor->grid_array[y][x].feat) && !current_floor->grid_array[y][x].m_idx)
+                       if (player_can_enter(current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(current_floor_ptr->grid_array[y][x].feat) && !current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                msg_print(NULL);
                                (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
@@ -222,7 +222,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_POISON);
                        else
                        {
@@ -247,7 +247,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_ZANMA);
                        else
                        {
@@ -271,7 +271,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, 0);
                        else
                        {
@@ -282,13 +282,13 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                return "";
                        }
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (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 = current_floor->grid_array[y][x].m_idx;
-                               monster_type *m_ptr = &m_list[m_idx];
+                               MONSTER_IDX m_idx = current_floor_ptr->grid_array[y][x].m_idx;
+                               monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
                                GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, 0);
@@ -307,8 +307,8 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                if ((ty != oy) || (tx != ox))
                                {
                                        msg_format(_("%sを吹き飛ばした！", "You blow %s away!"), m_name);
-                                       current_floor->grid_array[oy][ox].m_idx = 0;
-                                       current_floor->grid_array[ty][tx].m_idx = m_idx;
+                                       current_floor_ptr->grid_array[oy][ox].m_idx = 0;
+                                       current_floor_ptr->grid_array[ty][tx].m_idx = m_idx;
                                        m_ptr->fy = ty;
                                        m_ptr->fx = tx;
 
@@ -355,7 +355,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_HAGAN);
 
                        if (!cave_have_flag_bold(y, x, FF_HURT_ROCK)) break;
@@ -383,7 +383,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_COLD);
                        else
                        {
@@ -408,7 +408,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_KYUSHO);
                        else
                        {
@@ -433,7 +433,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_MAJIN);
                        else
                        {
@@ -458,7 +458,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_SUTEMI);
                        else
                        {
@@ -484,7 +484,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_ELEC);
                        else
                        {
@@ -525,8 +525,8 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                y = p_ptr->y + ddy_ddd[dir];
                                x = p_ptr->x + ddx_ddd[dir];
-                               g_ptr = &current_floor->grid_array[y][x];
-                               m_ptr = &m_list[g_ptr->m_idx];
+                               g_ptr = &current_floor_ptr->grid_array[y][x];
+                               m_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)))
@@ -558,7 +558,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_QUAKE);
                        else
                                earthquake(p_ptr->y, p_ptr->x, 10);
@@ -640,7 +640,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                                y = p_ptr->y + ddy[dir];
                                x = p_ptr->x + ddx[dir];
-                               g_ptr = &current_floor->grid_array[y][x];
+                               g_ptr = &current_floor_ptr->grid_array[y][x];
 
                                if (g_ptr->m_idx)
                                        py_attack(y, x, HISSATSU_3DAN);
@@ -661,7 +661,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                ny = y + ddy[dir];
                                nx = x + ddx[dir];
                                m_idx = g_ptr->m_idx;
-                               m_ptr = &m_list[m_idx];
+                               m_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))
@@ -672,7 +672,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                }
 
                                g_ptr->m_idx = 0;
-                               current_floor->grid_array[ny][nx].m_idx = m_idx;
+                               current_floor_ptr->grid_array[ny][nx].m_idx = m_idx;
                                m_ptr->fy = ny;
                                m_ptr->fx = nx;
 
@@ -715,7 +715,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_DRAIN);
                        else
                        {
@@ -816,10 +816,10 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                py_attack(y, x, 0);
-                               if (current_floor->grid_array[y][x].m_idx)
+                               if (current_floor_ptr->grid_array[y][x].m_idx)
                                {
                                        handle_stuff();
                                        py_attack(y, x, 0);
@@ -900,7 +900,7 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        y = p_ptr->y + ddy[dir];
                        x = p_ptr->x + ddx[dir];
 
-                       if (current_floor->grid_array[y][x].m_idx)
+                       if (current_floor_ptr->grid_array[y][x].m_idx)
                                py_attack(y, x, HISSATSU_UNDEAD);
                        else
                        {