From 73ceb76fe2e992eed0c09efeaa7248831583177b Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 28 Dec 2019 22:23:45 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20cave=5Fperma=5Fbold()=20?= =?utf8?q?=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=20cave=5Fperma=5Fbold().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor.h | 4 ++-- src/quest.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/floor.h b/src/floor.h index 7df7a7858..30b587bf6 100644 --- a/src/floor.h +++ b/src/floor.h @@ -299,8 +299,8 @@ extern floor_type floor_info; * * Line 1 -- permanent flag */ -#define cave_perma_bold(Y,X) \ - (cave_have_flag_bold(p_ptr->current_floor_ptr, (Y), (X), FF_PERMANENT)) +#define cave_perma_bold(F,Y,X) \ + (cave_have_flag_bold((F), (Y), (X), FF_PERMANENT)) /* diff --git a/src/quest.c b/src/quest.c index 256450e05..e7cdae5b1 100644 --- a/src/quest.c +++ b/src/quest.c @@ -283,7 +283,7 @@ void check_quest_completion(monster_type *m_ptr) POSITION ny, nx; /* Stagger around */ - while (cave_perma_bold(y, x) || p_ptr->current_floor_ptr->grid_array[y][x].o_idx || (p_ptr->current_floor_ptr->grid_array[y][x].info & CAVE_OBJECT)) + while (cave_perma_bold(p_ptr->current_floor_ptr, y, x) || p_ptr->current_floor_ptr->grid_array[y][x].o_idx || (p_ptr->current_floor_ptr->grid_array[y][x].info & CAVE_OBJECT)) { /* Pick a location */ scatter(&ny, &nx, y, x, 1, 0); -- 2.11.0