[Fix] #38993 current_floor -> current_floor_ptr

[hengbandforosx/hengbandosx.git] / src / melee1.c

diff --git a/src/melee1.c b/src/melee1.c
index 45d271a..dc707fc 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -436,7 +436,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
        int num = 0, bonus, chance, vir;
        HIT_POINT k;
 
-       grid_type       *g_ptr = &current_floor->grid_array[y][x];
+       grid_type       *g_ptr = &current_floor_ptr->grid_array[y][x];
 
        monster_type    *m_ptr = &m_list[g_ptr->m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
@@ -1307,7 +1307,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
        if (do_quake)
        {
                earthquake(p_ptr->y, p_ptr->x, 10);
-               if (!current_floor->grid_array[y][x].m_idx) *mdeath = TRUE;
+               if (!current_floor_ptr->grid_array[y][x].m_idx) *mdeath = TRUE;
        }
 }
 
@@ -1326,7 +1326,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        bool            mdeath = FALSE;
        bool            stormbringer = FALSE;
 
-       grid_type       *g_ptr = &current_floor->grid_array[y][x];
+       grid_type       *g_ptr = &current_floor_ptr->grid_array[y][x];
        monster_type    *m_ptr = &m_list[g_ptr->m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
        GAME_TEXT m_name[MAX_NLEN];
@@ -3004,7 +3004,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                        r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK);
                                        }
 
-                                       if (is_mirror_grid(&current_floor->grid_array[p_ptr->y][p_ptr->x]))
+                                       if (is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]))
                                        {
                                                teleport_player(10, 0L);
                                        }