[Refactor] #38997 place_outer_noperm_grid() を削除し、place_grid() に統合 / Removed place_out...

diff --git a/src/grid.c b/src/grid.c
index d0cd158..237db15 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -1208,17 +1208,6 @@ bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 m
 }
 
 
-void place_outer_noperm_grid(grid_type *g_ptr)
-{
-       feature_type *_f_ptr = &f_info[feat_wall_outer];
-       if (permanent_wall(_f_ptr)) g_ptr->feat = (s16b)feat_state(feat_wall_outer, FF_UNPERM);
-       else g_ptr->feat = feat_wall_outer;
-       g_ptr->info &= ~(CAVE_MASK);
-       g_ptr->info |= (CAVE_OUTER | CAVE_VAULT);
-       if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx);
-}
-
-
 void place_solid_perm_grid(grid_type *g_ptr)
 {
        g_ptr->feat = feat_permanent;

diff --git a/src/grid.h b/src/grid.h
index 3370859..e681b5a 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -317,7 +317,6 @@ typedef enum place_grid_type
        solid_perm
 } place_grid_type;
 
-extern void place_outer_noperm_grid(grid_type *g_ptr);
 extern void place_solid_perm_grid(grid_type *g_ptr);
 extern void place_grid(grid_type *g_ptr, place_grid_type pg_type);
 extern bool darkened_grid(player_type *player_ptr, grid_type *g_ptr);

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 967490c..23f5819 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -377,7 +377,7 @@ static void build_vault(player_type *player_ptr, POSITION yval, POSITION xval, P
                        {
                                /* Granite wall (outer) */
                        case '%':
-                               place_outer_noperm_grid(g_ptr);
+                               place_grid(g_ptr, outer_noperm);
                                break;
 
                                /* Granite wall (inner) */