[Fix] #38993 current_floor -> current_floor_ptr

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

diff --git a/src/monster1.c b/src/monster1.c
index 82d9aa3..c904f6e 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2173,7 +2173,7 @@ monsterrace_hook_type get_monster_hook(void)
  */
 monsterrace_hook_type get_monster_hook2(POSITION y, POSITION x)
 {
-       feature_type *f_ptr = &f_info[grid_array[y][x].feat];
+       feature_type *f_ptr = &f_info[current_floor_ptr->grid_array[y][x].feat];
 
        /* Set the monster list */
 
@@ -2370,7 +2370,7 @@ bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 m
  */
 bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 mode)
 {
-       grid_type *g_ptr = &grid_array[y][x];
+       grid_type *g_ptr = &current_floor_ptr->grid_array[y][x];
 
        /* Player or other monster */
        if (player_bold(y, x)) return FALSE;
@@ -3092,7 +3092,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        }
 
        /* Reset the object level */
-       object_level = base_level;
+       object_level = current_floor_ptr->base_level;
 
        /* Reset "coin" type */
        coin_type = 0;