From 70335fcc1f5a6a6a24256aec7855ba5bae0793e8 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 18 Jan 2020 19:49:28 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Finner=5Fperm=5Fbol?= =?utf8?q?d()=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81place=5Fgrid(?= =?utf8?q?)=20=E3=81=AB=E7=B5=B1=E5=90=88=20/=20Removed=20place=5Finner=5F?= =?utf8?q?perm=5Fbold()=20and=20unified=20into=20place=5Fbold()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/grid.c | 10 ---------- src/grid.h | 1 - src/rooms.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/grid.c b/src/grid.c index 5b21cda9f..15631f6a8 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_inner_perm_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_permanent); - floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); - add_cave_info(floor_ptr, y, x, CAVE_INNER); - delete_monster(player_ptr, y, x); -} - - void place_outer_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 f72d45620..71fefdb04 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_inner_perm_bold(player_type *player_ptr, POSITION y, POSITION x); void place_outer_bold(player_type *player_ptr, POSITION y, POSITION x); 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); diff --git a/src/rooms.c b/src/rooms.c index f60d95180..01dee8191 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -2050,7 +2050,7 @@ void generate_fill_perm_bold(player_type *player_ptr, POSITION y1, POSITION x1, for (x = x1; x <= x2; x++) { /* Point to grid */ - place_inner_perm_bold(player_ptr, y, x); + place_bold(player_ptr, y, x, inner_perm); } } } -- 2.11.0