[Refactor] #38997 place_floor_bold() に floor_type * 引数を追加． / Add floor_type * argumen...

[hengband/hengband.git] / src / floor-save.c

diff --git a/src/floor-save.c b/src/floor-save.c
index 5d25d84..b6b3760 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -373,7 +373,7 @@ static void build_dead_end(floor_type *floor_ptr)
        p_ptr->x = floor_ptr->width / 2;
 
        /* Give one square */
-       place_floor_bold(p_ptr->y, p_ptr->x);
+       place_floor_bold(floor_ptr, p_ptr->y, p_ptr->x);
 
        wipe_generate_random_floor_flags(floor_ptr);
 }
@@ -451,7 +451,7 @@ static void preserve_pet(void)
                                 * when you or the pet can see the other.
                                 */
                                if (m_ptr->nickname && 
-                                   ((player_has_los_bold(m_ptr->fy, m_ptr->fx) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)) ||
+                                   ((player_has_los_bold(p_ptr, m_ptr->fy, m_ptr->fx) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)) ||
                                     (los(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x))))
                                {
                                        if (dis > 3) continue;
@@ -728,7 +728,7 @@ static void get_out_monster(floor_type *floor_ptr, player_type *protected_ptr)
                if (!in_bounds(floor_ptr, ny, nx)) continue;
 
                /* Require "empty" floor space */
-               if (!cave_empty_bold(ny, nx)) continue;
+               if (!cave_empty_bold(p_ptr->current_floor_ptr, ny, nx)) continue;
 
                /* Hack -- no teleport onto glyph of warding */
                if (is_glyph_grid(&floor_ptr->grid_array[ny][nx])) continue;
@@ -1070,7 +1070,7 @@ void leave_floor(player_type *creature_ptr)
                sf_ptr->last_visit = current_world_ptr->game_turn;
 
                forget_lite(p_ptr->current_floor_ptr);
-               forget_view();
+               forget_view(p_ptr->current_floor_ptr);
                clear_mon_lite(p_ptr->current_floor_ptr);
 
                /* Save current floor */