From 156c765b9c33594c058702522e3e8d65f56d55c0 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 18 Jan 2020 17:19:25 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Finner=5Fperm=5Fgri?= =?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=5Fgrid()=20and=20unified=20into=20place=5Fgrid()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/grid.c | 17 +++++++---------- src/grid.h | 2 +- src/rooms-special.c | 2 +- src/rooms-vault.c | 6 +++--- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/grid.c b/src/grid.c index 470db2965..696cf62f9 100644 --- a/src/grid.c +++ b/src/grid.c @@ -1208,15 +1208,6 @@ bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 m } -void place_inner_perm_grid(grid_type *g_ptr) -{ - g_ptr->feat = feat_permanent; - g_ptr->info &= ~(CAVE_MASK); - g_ptr->info |= CAVE_INNER; - if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx); -} - - void place_outer_grid(grid_type *g_ptr) { g_ptr->feat = feat_wall_outer; @@ -1268,12 +1259,18 @@ void place_grid(grid_type *g_ptr, place_grid_type pg_type) g_ptr->info |= CAVE_INNER; break; } - case outer: + case inner_perm: { g_ptr->feat = feat_permanent; g_ptr->info |= CAVE_INNER; break; } + case outer: + { + g_ptr->feat = feat_wall_outer; + g_ptr->info |= CAVE_OUTER; + break; + } case outer_noperm: { feature_type *f_ptr = &f_info[feat_wall_outer]; diff --git a/src/grid.h b/src/grid.h index e3b9f663d..5d9f76704 100644 --- a/src/grid.h +++ b/src/grid.h @@ -311,12 +311,12 @@ typedef enum place_grid_type floor, extra, inner, + inner_perm, outer, outer_noperm, solid_perm } place_grid_type; -extern void place_inner_perm_grid(grid_type *g_ptr); extern void place_outer_grid(grid_type *g_ptr); extern void place_outer_noperm_grid(grid_type *g_ptr); extern void place_solid_perm_grid(grid_type *g_ptr); diff --git a/src/rooms-special.c b/src/rooms-special.c index 9f4b0ddee..4f18f11b9 100644 --- a/src/rooms-special.c +++ b/src/rooms-special.c @@ -107,7 +107,7 @@ bool build_type15(player_type *player_ptr) y = yval + 2 * ddy_ddd[dir1]; x = xval + 2 * ddx_ddd[dir1]; g_ptr = &floor_ptr->grid_array[y][x]; - place_inner_perm_grid(g_ptr); + place_grid(g_ptr, inner_perm); g_ptr->feat = feat_permanent_glass_wall; floor_ptr->grid_array[yval + ddy_ddd[dir1]][xval + ddx_ddd[dir1]].info |= (CAVE_ICKY); } diff --git a/src/rooms-vault.c b/src/rooms-vault.c index ac4558753..967490c40 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -393,12 +393,12 @@ static void build_vault(player_type *player_ptr, POSITION yval, POSITION xval, P /* Permanent wall (inner) */ case 'X': - place_inner_perm_grid(g_ptr); + place_grid(g_ptr, inner_perm); break; /* Permanent glass wall (inner) */ case 'Y': - place_inner_perm_grid(g_ptr); + place_grid(g_ptr, inner_perm); g_ptr->feat = feat_permanent_glass_wall; break; @@ -1094,7 +1094,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0 g_ptr->info |= (CAVE_ROOM | CAVE_ICKY); /* Permanent walls */ - place_inner_perm_grid(g_ptr); + place_grid(g_ptr, inner_perm); } } -- 2.11.0