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

diff --git a/src/floor-generate.c b/src/floor-generate.c
index c5d1e0c..3d0f1de 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -1078,7 +1078,7 @@ static void generate_challenge_arena(player_type *challanger_ptr)
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(challanger_ptr, y, x);
+                       place_bold(challanger_ptr, y, x, solid_perm);
 
                        /* Illuminate and memorize the walls */
                        floor_ptr->grid_array[y][x].info |= (CAVE_GLOW | CAVE_MARK);
@@ -1192,7 +1192,7 @@ static void generate_gambling_arena(player_type *creature_ptr)
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(creature_ptr, y, x);
+                       place_bold(creature_ptr, y, x, solid_perm);
 
                        /* Illuminate and memorize the walls */
                        floor_ptr->grid_array[y][x].info |= (CAVE_GLOW | CAVE_MARK);
@@ -1244,7 +1244,7 @@ static void generate_fixed_floor(player_type *player_ptr)
        {
                for (x = 0; x < floor_ptr->width; x++)
                {
-                       place_solid_perm_bold(player_ptr, y, x);
+                       place_bold(player_ptr, y, x, solid_perm);
                }
        }
 

diff --git a/src/floor-save.c b/src/floor-save.c
index 6f4ee24..cf78a76 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -373,7 +373,7 @@ static void build_dead_end(player_type *creature_ptr)
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(creature_ptr, y, x);
+                       place_bold(creature_ptr, y, x, solid_perm);
                }
        }
 

diff --git a/src/grid.c b/src/grid.c
index 26cd41e..24df711 100644 (file)
--- 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_solid_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_SOLID);
-       delete_monster(player_ptr, y, x);
-}
-
-
 void place_solid_noperm_bold(player_type *player_ptr, POSITION y, POSITION x)
 {
        feature_type *f_ptr = &f_info[feat_wall_solid];

diff --git a/src/grid.h b/src/grid.h
index ae67609..3a37182 100644 (file)
--- 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_solid_perm_bold(player_type *player_ptr, POSITION y, POSITION x);
 void place_solid_noperm_bold(player_type *player_ptr, POSITION y, POSITION x);
 
 /*