From 5872dd45dbe8612141c3835349e75cfdc91f5e2a Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 7 Dec 2019 19:31:46 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Fouter=5Fnoperm=5Fb?= =?utf8?q?old()=20=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20floor=5Ftype=20?= =?utf8?q?*=20argument=20to=20place=5Fouter=5Fnoperm=5Fbold().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/grid.h | 10 +++++----- src/rooms-vault.c | 18 +++++++++--------- src/rooms.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/grid.h b/src/grid.h index b0dbbc6ee..dd0812f96 100644 --- a/src/grid.h +++ b/src/grid.h @@ -243,13 +243,13 @@ typedef struct if ((C)->m_idx) delete_monster_idx((C)->m_idx); \ } -#define place_outer_noperm_bold(Y, X) \ +#define place_outer_noperm_bold(F, Y, X) \ { \ feature_type *_f_ptr = &f_info[feat_wall_outer]; \ - if (permanent_wall(_f_ptr)) set_cave_feat(p_ptr->current_floor_ptr, Y, X, (s16b)feat_state(feat_wall_outer, FF_UNPERM)); \ - else set_cave_feat(p_ptr->current_floor_ptr, Y,X,feat_wall_outer); \ - p_ptr->current_floor_ptr->grid_array[Y][X].info &= ~(CAVE_MASK); \ - add_cave_info(p_ptr->current_floor_ptr, Y,X,(CAVE_OUTER | CAVE_VAULT)); \ + if (permanent_wall(_f_ptr)) set_cave_feat((F), Y, X, (s16b)feat_state(feat_wall_outer, FF_UNPERM)); \ + else set_cave_feat((F), Y,X,feat_wall_outer); \ + (F)->grid_array[Y][X].info &= ~(CAVE_MASK); \ + add_cave_info((F), Y,X,(CAVE_OUTER | CAVE_VAULT)); \ delete_monster(Y, X); \ } diff --git a/src/rooms-vault.c b/src/rooms-vault.c index 8a3adcdb2..efbd95e60 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -88,9 +88,9 @@ static void build_bubble_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, { int side_x = x0 - xhsize + i; - place_outer_noperm_bold(y0 - yhsize + 0, side_x); + place_outer_noperm_bold(floor_ptr, y0 - yhsize + 0, side_x); floor_ptr->grid_array[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y0 - yhsize + ysize - 1, side_x); + place_outer_noperm_bold(floor_ptr, y0 - yhsize + ysize - 1, side_x); floor_ptr->grid_array[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY); } @@ -99,9 +99,9 @@ static void build_bubble_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, { int side_y = y0 - yhsize + i; - place_outer_noperm_bold(side_y, x0 - xhsize + 0); + place_outer_noperm_bold(floor_ptr, side_y, x0 - xhsize + 0); floor_ptr->grid_array[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(side_y, x0 - xhsize + xsize - 1); + place_outer_noperm_bold(floor_ptr, side_y, x0 - xhsize + xsize - 1); floor_ptr->grid_array[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY); } @@ -143,7 +143,7 @@ static void build_bubble_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, if (((min2 - min1) <= 2) && (!(min1 < 3))) { /* Boundary at midpoint+ not at inner region of bubble */ - place_outer_noperm_bold(y0 - yhsize + y, x0 - xhsize + x); + place_outer_noperm_bold(floor_ptr, y0 - yhsize + y, x0 - xhsize + x); } else { @@ -1049,7 +1049,7 @@ static void build_mini_c_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, floor_ptr->grid_array[y1 - 2][x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y1 - 2, x); + place_outer_noperm_bold(floor_ptr, y1 - 2, x); } for (x = x1 - 2; x <= x2 + 2; x++) @@ -1058,7 +1058,7 @@ static void build_mini_c_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, floor_ptr->grid_array[y2 + 2][x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y2 + 2, x); + place_outer_noperm_bold(floor_ptr, y2 + 2, x); } for (y = y1 - 2; y <= y2 + 2; y++) @@ -1067,7 +1067,7 @@ static void build_mini_c_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, floor_ptr->grid_array[y][x1 - 2].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y, x1 - 2); + place_outer_noperm_bold(floor_ptr, y, x1 - 2); } for (y = y1 - 2; y <= y2 + 2; y++) @@ -1076,7 +1076,7 @@ static void build_mini_c_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, floor_ptr->grid_array[y][x2 + 2].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y, x2 + 2); + place_outer_noperm_bold(floor_ptr, y, x2 + 2); } for (y = y1 - 1; y <= y2 + 1; y++) diff --git a/src/rooms.c b/src/rooms.c index d7f34094b..e266b439e 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -1550,18 +1550,18 @@ void build_room(floor_type *floor_ptr, POSITION x1, POSITION x2, POSITION y1, PO /* Top and bottom boundaries */ for (i = 0; i <= xsize; i++) { - place_outer_noperm_bold(y1, x1 + i); + place_outer_noperm_bold(floor_ptr, y1, x1 + i); floor_ptr->grid_array[y1][x1 + i].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y2, x1 + i); + place_outer_noperm_bold(floor_ptr, y2, x1 + i); floor_ptr->grid_array[y2][x1 + i].info |= (CAVE_ROOM | CAVE_ICKY); } /* Left and right boundaries */ for (i = 1; i < ysize; i++) { - place_outer_noperm_bold(y1 + i, x1); + place_outer_noperm_bold(floor_ptr, y1 + i, x1); floor_ptr->grid_array[y1 + i][x1].info|=(CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(y1 + i, x2); + place_outer_noperm_bold(floor_ptr, y1 + i, x2); floor_ptr->grid_array[y1 + i][x2].info|=(CAVE_ROOM | CAVE_ICKY); } -- 2.11.0