From aa2f3273af7b3693717257585066ebd9176e7cd8 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 18 Jan 2020 19:56:31 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Fsolid=5Fbold()=20?= =?utf8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81place=5Fgrid()=20?= =?utf8?q?=E3=81=AB=E7=B5=B1=E5=90=88=20/=20Removed=20place=5Fsolid=5Fbold?= =?utf8?q?()=20and=20unified=20into=20place=5Fbold()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor.c | 8 ++++---- src/grid.c | 10 ---------- src/grid.h | 1 - src/rooms-normal.c | 8 ++++---- src/rooms-pitnest.c | 8 ++++---- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/floor.c b/src/floor.c index 60954e1a7..37b70d0f6 100644 --- a/src/floor.c +++ b/src/floor.c @@ -224,8 +224,8 @@ void add_door(player_type *player_ptr, POSITION x, POSITION y) place_secret_door(player_ptr, y, x, DOOR_DEFAULT); /* set boundarys so don't get wide doors */ - place_solid_bold(player_ptr, y, x - 1); - place_solid_bold(player_ptr, y, x + 1); + place_bold(player_ptr, y, x - 1, solid); + place_bold(player_ptr, y, x + 1, solid); } /* look at: @@ -243,8 +243,8 @@ void add_door(player_type *player_ptr, POSITION x, POSITION y) place_secret_door(player_ptr, y, x, DOOR_DEFAULT); /* set boundarys so don't get wide doors */ - place_solid_bold(player_ptr, y - 1, x); - place_solid_bold(player_ptr, y + 1, x); + place_bold(player_ptr, y - 1, x, solid); + place_bold(player_ptr, y + 1, x, solid); } } diff --git a/src/grid.c b/src/grid.c index 352d0fa20..26cd41eba 100644 --- a/src/grid.c +++ b/src/grid.c @@ -1295,16 +1295,6 @@ bool darkened_grid(player_type *player_ptr, grid_type *g_ptr) } -void place_solid_bold(player_type *player_ptr, POSITION y, POSITION x) -{ - floor_type *floor_ptr = player_ptr->current_floor_ptr; - set_cave_feat(floor_ptr, y, x, feat_wall_solid); - floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); - add_cave_info(floor_ptr, y, x, CAVE_SOLID); - delete_monster(player_ptr, y, x); -} - - void place_solid_perm_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 0d4888eb9..ae67609f8 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_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-normal.c b/src/rooms-normal.c index fe5944969..27f163b42 100644 --- a/src/rooms-normal.c +++ b/src/rooms-normal.c @@ -180,8 +180,8 @@ bool build_type1(player_type *player_ptr) } /* Prevent edge of wall from being tunneled */ - place_solid_bold(player_ptr, yval, x1 - 1); - place_solid_bold(player_ptr, yval, x2 + 1); + place_bold(player_ptr, yval, x1 - 1, solid); + place_bold(player_ptr, yval, x2 + 1, solid); } else { @@ -193,8 +193,8 @@ bool build_type1(player_type *player_ptr) } /* Prevent edge of wall from being tunneled */ - place_solid_bold(player_ptr, y1 - 1, xval); - place_solid_bold(player_ptr, y2 + 1, xval); + place_bold(player_ptr, y1 - 1, xval, solid); + place_bold(player_ptr, y2 + 1, xval, solid); } place_random_door(player_ptr, yval, xval, TRUE); diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index 470b52b7e..c12fa0857 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -935,12 +935,12 @@ bool build_type13(player_type *player_ptr) for (y = y1; y <= yval; y++) { place_bold(player_ptr, y, x2, floor); - place_solid_bold(player_ptr, y, x1 - 1); + place_bold(player_ptr, y, x1 - 1, solid); } for (y = yval; y <= y2 + 1; y++) { place_bold(player_ptr, y, x1, floor); - place_solid_bold(player_ptr, y, x2 + 1); + place_bold(player_ptr, y, x2 + 1, solid); } } else @@ -948,12 +948,12 @@ bool build_type13(player_type *player_ptr) for (y = yval; y <= y2 + 1; y++) { place_bold(player_ptr, y, x1, floor); - place_solid_bold(player_ptr, y, x2 + 1); + place_bold(player_ptr, y, x2 + 1, solid); } for (y = y1; y <= yval; y++) { place_bold(player_ptr, y, x2, floor); - place_solid_bold(player_ptr, y, x1 - 1); + place_bold(player_ptr, y, x1 - 1, solid); } } -- 2.11.0