From b067d1f5743b2d477cdebae7ffc6938879fd76b9 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 2 Jan 2020 19:59:29 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20update=5Funique=5Fartifact?= =?utf8?q?()=20=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20floor=5Ftype=20*=20argum?= =?utf8?q?ent=20to=20update=5Funique=5Fartifact().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-save.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/floor-save.c b/src/floor-save.c index a9d811f8c..93e6e6cbb 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -655,15 +655,15 @@ static void place_pet(player_type *master_ptr) * while new floor creation since dungeons may be re-created by\n * auto-scum option.\n */ -static void update_unique_artifact(s16b cur_floor_id) +static void update_unique_artifact(floor_type *floor_ptr, s16b cur_floor_id) { int i; /* Maintain unique monsters */ - for (i = 1; i < p_ptr->current_floor_ptr->m_max; i++) + for (i = 1; i < floor_ptr->m_max; i++) { monster_race *r_ptr; - monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[i]; + monster_type *m_ptr = &floor_ptr->m_list[i]; if (!monster_is_valid(m_ptr)) continue; @@ -679,9 +679,9 @@ static void update_unique_artifact(s16b cur_floor_id) } /* Maintain artifatcs */ - for (i = 1; i < p_ptr->current_floor_ptr->o_max; i++) + for (i = 1; i < floor_ptr->o_max; i++) { - object_type *o_ptr = &p_ptr->current_floor_ptr->o_list[i]; + object_type *o_ptr = &floor_ptr->o_list[i]; if (!OBJECT_IS_VALID(o_ptr)) continue; @@ -1388,7 +1388,7 @@ void change_floor(player_type *creature_ptr) forget_travel_flow(); /* Hack -- maintain unique and artifacts */ - update_unique_artifact(new_floor_id); + update_unique_artifact(creature_ptr->current_floor_ptr, new_floor_id); /* Now the player is in new floor */ creature_ptr->floor_id = new_floor_id; -- 2.11.0