[Refactor] #38997 is_known_trap() とis_hidden_door()にplayer_type * 引数を追加 / Added playe...

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

diff --git a/src/floor-save.c b/src/floor-save.c
index 235105f..90fa7ef 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,8 +489,8 @@ 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);
-                       exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
+                       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);
                }
        }
 }
@@ -562,7 +562,7 @@ static void place_pet(player_type *master_ptr)
 
                if (i == 0)
                {
-                       m_idx = m_pop();
+                       m_idx = m_pop(master_ptr);
                        master_ptr->riding = m_idx;
                        if (m_idx)
                        {
@@ -584,7 +584,7 @@ static void place_pet(player_type *master_ptr)
                                }
                                if (j) break;
                        }
-                       m_idx = (d == 6) ? 0 : m_pop();
+                       m_idx = (d == 6) ? 0 : m_pop(master_ptr);
                }
 
                if (m_idx)
@@ -617,7 +617,7 @@ static void place_pet(player_type *master_ptr)
                                repair_monsters = TRUE;
                        }
                        update_monster(master_ptr, m_idx, TRUE);
-                       lite_spot(cy, cx);
+                       lite_spot(master_ptr, cy, cx);
 
                        /* Pre-calculated in precalc_cur_num_of_pet() */
                        /* r_ptr->cur_num++; */
@@ -632,12 +632,12 @@ 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);
-                               exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
+                               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);
                        }
 
                        /* Pre-calculated in precalc_cur_num_of_pet(), but need to decrease */
@@ -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);
                                }
                        }
 
@@ -1272,7 +1272,7 @@ void change_floor(player_type *creature_ptr)
                                if (a_info[o_ptr->name1].floor_id != new_floor_id)
                                {
                                        /* Disappear from here */
-                                       delete_object_idx(creature_ptr->current_floor_ptr, i);
+                                       delete_object_idx(creature_ptr, i);
                                }
                                else
                                {
@@ -1292,7 +1292,7 @@ void change_floor(player_type *creature_ptr)
                        for (i = 0; i < alloc_times; i++)
                        {
                                /* Make a (group of) new monster */
-                               (void)alloc_monster(0, 0);
+                               (void)alloc_monster(creature_ptr, 0, 0);
                        }
 
                }
@@ -1340,13 +1340,13 @@ void change_floor(player_type *creature_ptr)
                                /* No stairs down from Quest */
                                if ((creature_ptr->change_floor_mode & CFM_UP) && !quest_number(creature_ptr, creature_ptr->current_floor_ptr->dun_level))
                                {
-                                       g_ptr->feat = (creature_ptr->change_floor_mode & CFM_SHAFT) ? feat_state(feat_down_stair, FF_SHAFT) : feat_down_stair;
+                                       g_ptr->feat = (creature_ptr->change_floor_mode & CFM_SHAFT) ? feat_state(creature_ptr, feat_down_stair, FF_SHAFT) : feat_down_stair;
                                }
 
                                /* No stairs up when ironman_downward */
                                else if ((creature_ptr->change_floor_mode & CFM_DOWN) && !ironman_downward)
                                {
-                                       g_ptr->feat = (creature_ptr->change_floor_mode & CFM_SHAFT) ? feat_state(feat_up_stair, FF_SHAFT) : feat_up_stair;
+                                       g_ptr->feat = (creature_ptr->change_floor_mode & CFM_SHAFT) ? feat_state(creature_ptr, feat_up_stair, FF_SHAFT) : feat_up_stair;
                                }
 
                                /* Paranoia -- Clear mimic */