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

diff --git a/src/grid.c b/src/grid.c
index 9756ef5..2b69681 100644 (file)
--- 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_extra_grid(grid_type *g_ptr)
-{
-       g_ptr->feat = feat_wall_type[randint0(100)];
-       g_ptr->info &= ~(CAVE_MASK);
-       g_ptr->info |= CAVE_EXTRA;
-       if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx);
-}
-
-
 void place_inner_grid(grid_type *g_ptr)
 {
        g_ptr->feat = feat_wall_inner;

diff --git a/src/grid.h b/src/grid.h
index dafe419..6a3a4de 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -316,7 +316,6 @@ typedef enum place_grid_type
        solid_perm
 } place_grid_type;
 
-extern void place_extra_grid(grid_type *g_ptr);
 extern void place_inner_grid(grid_type *g_ptr);
 extern void place_inner_perm_grid(grid_type *g_ptr);
 extern void place_outer_grid(grid_type *g_ptr);

diff --git a/src/rooms.c b/src/rooms.c
index 74cce31..362f55a 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -1696,7 +1696,7 @@ void build_maze_vault(player_type *player_ptr, POSITION x0, POSITION y0, POSITIO
                        }
                        else if (!is_vault)
                        {
-                               place_extra_grid(g_ptr);
+                               place_grid(g_ptr, extra);
                        }
                        else
                        {

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 71cbe6f..5001fca 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -601,7 +601,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r,
                        if (t < 20)
                        {
                                /* Create granite wall */
-                               place_extra_grid(g_ptr);
+                               place_grid(g_ptr, extra);
                        }
                        else if (t < 70)
                        {