[Refactor] #38997 place_solid_perm_bold() を削除し、place_grid() に統合 / Removed place_solid...

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

diff --git a/src/floor-save.c b/src/floor-save.c
index 9652fec..cf78a76 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -373,7 +373,7 @@ static void build_dead_end(player_type *creature_ptr)
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(creature_ptr->current_floor_ptr, y, x);
+                       place_bold(creature_ptr, y, x, solid_perm);
                }
        }
 
@@ -382,7 +382,7 @@ static void build_dead_end(player_type *creature_ptr)
        creature_ptr->x = creature_ptr->current_floor_ptr->width / 2;
 
        /* Give one square */
-       place_floor_bold(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x);
+       place_bold(creature_ptr, creature_ptr->y, creature_ptr->x, floor);
 
        wipe_generate_random_floor_flags(creature_ptr->current_floor_ptr);
 }
@@ -420,7 +420,7 @@ static void preserve_pet(player_type *master_ptr)
                        (void)COPY(&party_mon[0], m_ptr, monster_type);
 
                        /* Delete from this floor */
-                       delete_monster_idx(master_ptr->riding);
+                       delete_monster_idx(master_ptr, master_ptr->riding);
                }
        }
 
@@ -473,7 +473,7 @@ static void preserve_pet(player_type *master_ptr)
                        num++;
 
                        /* Delete from this floor */
-                       delete_monster_idx(i);
+                       delete_monster_idx(master_ptr, i);
                }
        }
 
@@ -489,7 +489,7 @@ static void preserve_pet(player_type *master_ptr)
                        if (!m_ptr->nickname) continue;
                        if (master_ptr->riding == i) continue;
 
-                       monster_desc(m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+                       monster_desc(master_ptr, m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
                        exe_write_diary(master_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
                }
        }
@@ -508,11 +508,11 @@ static void preserve_pet(player_type *master_ptr)
                        if (is_seen(m_ptr))
                        {
                                GAME_TEXT m_name[MAX_NLEN];
-                               monster_desc(m_name, m_ptr, 0);
+                               monster_desc(master_ptr, m_name, m_ptr, 0);
                                msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
                        }
 
-                       delete_monster_idx(i);
+                       delete_monster_idx(master_ptr, i);
                }
        }
 }
@@ -632,11 +632,11 @@ static void place_pet(player_type *master_ptr)
                        monster_race *r_ptr = real_r_ptr(m_ptr);
                        GAME_TEXT m_name[MAX_NLEN];
 
-                       monster_desc(m_name, m_ptr, 0);
+                       monster_desc(master_ptr, m_name, m_ptr, 0);
                        msg_format(_("%sとはぐれてしまった。", "You have lost sight of %s."), m_name);
                        if (record_named_pet && m_ptr->nickname)
                        {
-                               monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+                               monster_desc(master_ptr, m_name, m_ptr, MD_INDEF_VISIBLE);
                                exe_write_diary(master_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
                        }
 
@@ -933,7 +933,7 @@ void leave_floor(player_type *creature_ptr)
                    (r_ptr->flags7 & RF7_NAZGUL)) continue;
 
                /* Delete non-unique quest monsters */
-               delete_monster_idx(i);
+               delete_monster_idx(creature_ptr, i);
        }
 
        /* Check if there is a same item */
@@ -1254,7 +1254,7 @@ void change_floor(player_type *creature_ptr)
                                if (r_ptr->floor_id != new_floor_id)
                                {
                                        /* Disapper from here */
-                                       delete_monster_idx(i);
+                                       delete_monster_idx(creature_ptr, i);
                                }
                        }