From 99e6f9dd02326b9d91d771b810cf76325ed66964 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 15 Sep 2019 12:04:19 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Fpet()=20=E3=81=AB?= =?utf8?q?=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argument=20to?= =?utf8?q?=20place=5Fpet()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-save.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/floor-save.c b/src/floor-save.c index 434de1b9f..2dcca0acb 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -537,10 +537,10 @@ void precalc_cur_num_of_pet(void) * @brief 移動先のフロアに伴ったペットを配置する / Place preserved pet monsters on new floor * @return なし */ -static void place_pet(void) +static void place_pet(player_type *master_ptr) { int i; - int max_num = p_ptr->wild_mode ? 1 : MAX_PARTY_MON; + int max_num = master_ptr->wild_mode ? 1 : MAX_PARTY_MON; for (i = 0; i < max_num; i++) { @@ -552,11 +552,11 @@ static void place_pet(void) if (i == 0) { m_idx = m_pop(); - p_ptr->riding = m_idx; + master_ptr->riding = m_idx; if (m_idx) { - cy = p_ptr->y; - cx = p_ptr->x; + cy = master_ptr->y; + cx = master_ptr->x; } } else @@ -568,7 +568,7 @@ static void place_pet(void) { for (j = 1000; j > 0; j--) { - scatter(&cy, &cx, p_ptr->y, p_ptr->x, d, 0); + scatter(&cy, &cx, master_ptr->y, master_ptr->x, d, 0); if (monster_can_enter(cy, cx, &r_info[party_mon[i].r_idx], 0)) break; } if (j) break; @@ -625,7 +625,7 @@ static void place_pet(void) if (record_named_pet && m_ptr->nickname) { monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name); + exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name); } /* Pre-calculated in precalc_cur_num_of_pet(), but need to decrease */ @@ -1376,7 +1376,7 @@ void change_floor(BIT_FLAGS floor_mode) } /* Place preserved pet monsters */ - place_pet(); + place_pet(p_ptr); /* Reset travel target place */ forget_travel_flow(); -- 2.11.0