From 620da2882458627a1270c854cad4ee0cbe82fe21 Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 7 Dec 2019 19:04:38 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Finner=5Fperm=5Fbol?= =?utf8?q?d()=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=20place=5Finner=5Fperm=5Fbold().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/grid.h | 8 ++++---- src/rooms.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/grid.h b/src/grid.h index 28697ea6d..7c7048044 100644 --- a/src/grid.h +++ b/src/grid.h @@ -195,11 +195,11 @@ typedef struct if ((C)->m_idx) delete_monster_idx((C)->m_idx); \ } -#define place_inner_perm_bold(Y, X) \ +#define place_inner_perm_bold(F, Y, X) \ { \ - set_cave_feat(p_ptr->current_floor_ptr, Y,X,feat_permanent); \ - p_ptr->current_floor_ptr->grid_array[Y][X].info &= ~(CAVE_MASK); \ - add_cave_info(p_ptr->current_floor_ptr, Y,X,CAVE_INNER); \ + set_cave_feat(F, Y,X,feat_permanent); \ + (F)->grid_array[Y][X].info &= ~(CAVE_MASK); \ + add_cave_info((F), Y,X,CAVE_INNER); \ delete_monster(Y, X); \ } diff --git a/src/rooms.c b/src/rooms.c index cd02e19aa..226b36c9a 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -2069,7 +2069,7 @@ void generate_fill_perm_bold(POSITION y1, POSITION x1, POSITION y2, POSITION x2) for (x = x1; x <= x2; x++) { /* Point to grid */ - place_inner_perm_bold(y, x); + place_inner_perm_bold(p_ptr->current_floor_ptr ,y, x); } } } -- 2.11.0