From 7006b58015c900f753c433b6cba94c304c4b9f40 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 18 Jan 2020 19:43:06 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Fextra=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=5Fextra=5Fbold?= =?utf8?q?()=20and=20unified=20into=20place=5Fbold()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-generate.c | 10 +++++----- src/grid.c | 10 ---------- src/grid.h | 1 - src/rooms-normal.c | 6 +++--- src/rooms-vault.c | 6 +++--- src/rooms.c | 24 ++++++++++++------------ 6 files changed, 23 insertions(+), 34 deletions(-) diff --git a/src/floor-generate.c b/src/floor-generate.c index c1a1168f2..d37ba8e01 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -649,15 +649,15 @@ static bool cave_gen(player_type *player_ptr) /* Special boundary walls -- Top and bottom */ for (x = 0; x < floor_ptr->width; x++) { - place_extra_bold(player_ptr, 0, x); - place_extra_bold(player_ptr, floor_ptr->height - 1, x); + place_bold(player_ptr, 0, x, extra); + place_bold(player_ptr, floor_ptr->height - 1, x, extra); } /* Special boundary walls -- Left and right */ for (y = 1; y < (floor_ptr->height - 1); y++) { - place_extra_bold(player_ptr, y, 0); - place_extra_bold(player_ptr, y, floor_ptr->width - 1); + place_bold(player_ptr, y, 0, extra); + place_bold(player_ptr, y, floor_ptr->width - 1, extra); } } else @@ -667,7 +667,7 @@ static bool cave_gen(player_type *player_ptr) { for (x = 0; x < floor_ptr->width; x++) { - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } } } diff --git a/src/grid.c b/src/grid.c index 85138bbeb..b6b101fdb 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_extra_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_type[randint0(100)]); - floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); - add_cave_info(floor_ptr, y, x, CAVE_EXTRA); - delete_monster(player_ptr, y, x); -} - - void place_extra_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 3cc6ea020..7c2fa24f1 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_extra_bold(player_type *player_ptr, POSITION y, POSITION x); void place_extra_perm_bold(player_type *player_ptr, POSITION y, POSITION x); void place_inner_bold(player_type *player_ptr, POSITION y, POSITION x); void place_inner_perm_bold(player_type *player_ptr, POSITION y, POSITION x); diff --git a/src/rooms-normal.c b/src/rooms-normal.c index 008bd7179..4314d0f11 100644 --- a/src/rooms-normal.c +++ b/src/rooms-normal.c @@ -946,7 +946,7 @@ bool build_type11(player_type *player_ptr) else if (distance(y0, x0, y, x) <= rad + 1) { /* make granite outside so arena works */ - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } } } @@ -1010,14 +1010,14 @@ bool build_type12(player_type *player_ptr) else { /* make granite outside so arena works */ - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } /* proper boundary for arena */ if (((y + rad) == y0) || ((y - rad) == y0) || ((x + rad) == x0) || ((x - rad) == x0)) { - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } } } diff --git a/src/rooms-vault.c b/src/rooms-vault.c index d6589f78b..feae595b9 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -190,7 +190,7 @@ static void build_room_vault(player_type *player_ptr, POSITION x0, POSITION y0, { POSITION y = y0 - yhsize + y1; - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); floor_ptr->grid_array[y][x].info &= (~CAVE_ICKY); } } @@ -853,14 +853,14 @@ static void build_target_vault(player_type *player_ptr, POSITION x0, POSITION y0 else { /* make granite outside so arena works */ - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } /* proper boundary for arena */ if (((y + rad) == y0) || ((y - rad) == y0) || ((x + rad) == x0) || ((x - rad) == x0)) { - place_extra_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, extra); } } } diff --git a/src/rooms.c b/src/rooms.c index fb34fa1a7..53c8be258 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -971,7 +971,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO { for (y = 0; y <= ysize; ++y) { - place_extra_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize); + place_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize, extra); floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY | CAVE_ROOM); } } @@ -997,7 +997,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO else { /* set to be normal granite */ - place_extra_bold(player_ptr, y0 + 0 - yhsize, x0 + i - xhsize); + place_bold(player_ptr, y0 + 0 - yhsize, x0 + i - xhsize, extra); } /* bottom boundary */ @@ -1012,7 +1012,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO else { /* set to be normal granite */ - place_extra_bold(player_ptr, y0 + ysize - yhsize, x0 + i - xhsize); + place_bold(player_ptr, y0 + ysize - yhsize, x0 + i - xhsize, extra); } /* clear the icky flag-don't need it any more */ @@ -1035,7 +1035,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO else { /* outside room */ - place_extra_bold(player_ptr, y0 + i - yhsize, x0 + 0 - xhsize); + place_bold(player_ptr, y0 + i - yhsize, x0 + 0 - xhsize, extra); } /* right boundary */ if ((floor_ptr->grid_array[i + y0 - yhsize][xsize + x0 - xhsize].info & CAVE_ICKY) && room) @@ -1049,7 +1049,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO else { /* outside room */ - place_extra_bold(player_ptr, y0 + i - yhsize, x0 + xsize - xhsize); + place_bold(player_ptr, y0 + i - yhsize, x0 + xsize - xhsize, extra); } /* clear icky flag -done with it */ @@ -1086,14 +1086,14 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO else { - place_extra_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize); + place_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize, extra); floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ROOM); } } else { /* Clear the unconnected regions */ - place_extra_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize); + place_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize, extra); floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY | CAVE_ROOM); } } @@ -1255,8 +1255,8 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x /* Do boundarys- set to normal granite */ for (i = 0; i <= xsize; ++i) { - place_extra_bold(player_ptr, y0 + 0 - yhsize, x0 + i - xhsize); - place_extra_bold(player_ptr, y0 + ysize - yhsize, x0 + i - xhsize); + place_bold(player_ptr, y0 + 0 - yhsize, x0 + i - xhsize, extra); + place_bold(player_ptr, y0 + ysize - yhsize, x0 + i - xhsize, extra); /* clear the icky flag-don't need it any more */ floor_ptr->grid_array[y0 + 0 - yhsize][x0 + i - xhsize].info &= ~(CAVE_ICKY); @@ -1267,8 +1267,8 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x for (i = 1; i < ysize; ++i) { - place_extra_bold(player_ptr, y0 + i - yhsize, x0 + 0 - xhsize); - place_extra_bold(player_ptr, y0 + i - yhsize, x0 + xsize - xhsize); + place_bold(player_ptr, y0 + i - yhsize, x0 + 0 - xhsize, extra); + place_bold(player_ptr, y0 + i - yhsize, x0 + xsize - xhsize, extra); /* clear icky flag -done with it */ floor_ptr->grid_array[y0 + i - yhsize][x0 + 0 - xhsize].info &= ~(CAVE_ICKY); @@ -1284,7 +1284,7 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x /* Fill unconnected regions with granite */ if ((!(floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info & CAVE_ICKY)) || is_outer_bold(floor_ptr, y0 + y - yhsize, x0 + x - xhsize)) - place_extra_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize); + place_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize, extra); /* turn off icky flag (no longer needed.) */ floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY | CAVE_ROOM); -- 2.11.0