From 1f8965984878cb7c9e777542aba4c5966901a511 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 18 Jan 2020 19:54:24 +0900 Subject: [PATCH 1/1] =?utf8?q?[Refactor]=20#38997=20place=5Fouter=5Fnoperm?= =?utf8?q?=5Fbold()=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81place?= =?utf8?q?=5Fgrid()=20=E3=81=AB=E7=B5=B1=E5=90=88=20/=20Removed=20place=5F?= =?utf8?q?outer=5Fnoperm=5Fbold()=20and=20unified=20into=20place=5Fbold()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/grid.c | 12 ------------ src/grid.h | 1 - src/rooms-vault.c | 18 +++++++++--------- src/rooms.c | 8 ++++---- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/grid.c b/src/grid.c index 26fb2de10..352d0fa20 100644 --- a/src/grid.c +++ b/src/grid.c @@ -1295,18 +1295,6 @@ bool darkened_grid(player_type *player_ptr, grid_type *g_ptr) } -void place_outer_noperm_bold(player_type *player_ptr, POSITION y, POSITION x) -{ - floor_type *floor_ptr = player_ptr->current_floor_ptr; - feature_type *_f_ptr = &f_info[feat_wall_outer]; - if (permanent_wall(_f_ptr)) set_cave_feat(floor_ptr, y, x, (s16b)feat_state(feat_wall_outer, FF_UNPERM)); - else set_cave_feat(floor_ptr, y, x, feat_wall_outer); - floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); - add_cave_info(floor_ptr, y, x, (CAVE_OUTER | CAVE_VAULT)); - delete_monster(player_ptr, y, x); -} - - void place_solid_bold(player_type *player_ptr, POSITION y, POSITION x) { floor_type *floor_ptr = player_ptr->current_floor_ptr; diff --git a/src/grid.h b/src/grid.h index 8af3ad6e0..0d4888eb9 100644 --- a/src/grid.h +++ b/src/grid.h @@ -218,7 +218,6 @@ extern void place_grid(player_type *player_ptr, grid_type *g_ptr, grid_bold_type extern bool darkened_grid(player_type *player_ptr, grid_type *g_ptr); extern void delete_monster(player_type *player_ptr, POSITION y, POSITION x); extern void place_bold(player_type *player_ptr, POSITION y, POSITION x, grid_bold_type gh_type); -void place_outer_noperm_bold(player_type *player_ptr, POSITION y, POSITION x); void place_solid_bold(player_type *player_ptr, POSITION y, POSITION x); void place_solid_perm_bold(player_type *player_ptr, POSITION y, POSITION x); void place_solid_noperm_bold(player_type *player_ptr, POSITION y, POSITION x); diff --git a/src/rooms-vault.c b/src/rooms-vault.c index 2017b8fb5..ad7c973a1 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -88,9 +88,9 @@ static void build_bubble_vault(player_type *player_ptr, POSITION x0, POSITION y0 { int side_x = x0 - xhsize + i; - place_outer_noperm_bold(player_ptr, y0 - yhsize + 0, side_x); + place_bold(player_ptr, y0 - yhsize + 0, side_x, outer_noperm); floor_ptr->grid_array[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y0 - yhsize + ysize - 1, side_x); + place_bold(player_ptr, y0 - yhsize + ysize - 1, side_x, outer_noperm); floor_ptr->grid_array[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY); } @@ -99,9 +99,9 @@ static void build_bubble_vault(player_type *player_ptr, POSITION x0, POSITION y0 { int side_y = y0 - yhsize + i; - place_outer_noperm_bold(player_ptr, side_y, x0 - xhsize + 0); + place_bold(player_ptr, side_y, x0 - xhsize + 0, outer_noperm); floor_ptr->grid_array[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, side_y, x0 - xhsize + xsize - 1); + place_bold(player_ptr, side_y, x0 - xhsize + xsize - 1, outer_noperm); floor_ptr->grid_array[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY); } @@ -143,7 +143,7 @@ static void build_bubble_vault(player_type *player_ptr, POSITION x0, POSITION y0 if (((min2 - min1) <= 2) && (!(min1 < 3))) { /* Boundary at midpoint+ not at inner region of bubble */ - place_outer_noperm_bold(player_ptr, y0 - yhsize + y, x0 - xhsize + x); + place_bold(player_ptr, y0 - yhsize + y, x0 - xhsize + x, outer_noperm); } else { @@ -1055,7 +1055,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0 floor_ptr->grid_array[y1 - 2][x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y1 - 2, x); + place_bold(player_ptr, y1 - 2, x, outer_noperm); } for (x = x1 - 2; x <= x2 + 2; x++) @@ -1064,7 +1064,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0 floor_ptr->grid_array[y2 + 2][x].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y2 + 2, x); + place_bold(player_ptr, y2 + 2, x, outer_noperm); } for (y = y1 - 2; y <= y2 + 2; y++) @@ -1073,7 +1073,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0 floor_ptr->grid_array[y][x1 - 2].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y, x1 - 2); + place_bold(player_ptr, y, x1 - 2, outer_noperm); } for (y = y1 - 2; y <= y2 + 2; y++) @@ -1082,7 +1082,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0 floor_ptr->grid_array[y][x2 + 2].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y, x2 + 2); + place_bold(player_ptr, y, x2 + 2, outer_noperm); } for (y = y1 - 1; y <= y2 + 1; y++) diff --git a/src/rooms.c b/src/rooms.c index 30983e76e..e3a9c4c06 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -1531,18 +1531,18 @@ void build_room(player_type *player_ptr, POSITION x1, POSITION x2, POSITION y1, floor_type *floor_ptr = player_ptr->current_floor_ptr; for (i = 0; i <= xsize; i++) { - place_outer_noperm_bold(player_ptr, y1, x1 + i); + place_bold(player_ptr, y1, x1 + i, outer_noperm); floor_ptr->grid_array[y1][x1 + i].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y2, x1 + i); + place_bold(player_ptr, y2, x1 + i, outer_noperm); 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(player_ptr, y1 + i, x1); + place_bold(player_ptr, y1 + i, x1, outer_noperm); floor_ptr->grid_array[y1 + i][x1].info |= (CAVE_ROOM | CAVE_ICKY); - place_outer_noperm_bold(player_ptr, y1 + i, x2); + place_bold(player_ptr, y1 + i, x2, outer_noperm); floor_ptr->grid_array[y1 + i][x2].info |= (CAVE_ROOM | CAVE_ICKY); } -- 2.11.0