[Refactor] #38997 place_solid_perm_bold() に floor_type * 引数を追加． / Add floor_type...

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 65ae70d..1c7a3fa 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -1068,7 +1068,7 @@ static void generate_challenge_arena(floor_type *floor_ptr, player_type *challan
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(y, x);
+                       place_solid_perm_bold(floor_ptr, y, x);
 
                        /* Illuminate and memorize the walls */
                        floor_ptr->grid_array[y][x].info |= (CAVE_GLOW | CAVE_MARK);
@@ -1176,7 +1176,7 @@ static void generate_gambling_arena(floor_type *floor_ptr, player_type *creature
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(y, x);
+                       place_solid_perm_bold(floor_ptr, y, x);
 
                        /* Illuminate and memorize the walls */
                        floor_ptr->grid_array[y][x].info |= (CAVE_GLOW | CAVE_MARK);
@@ -1224,7 +1224,7 @@ static void generate_fixed_floor(floor_type *floor_ptr)
        {
                for (x = 0; x < floor_ptr->width; x++)
                {
-                       place_solid_perm_bold(y, x);
+                       place_solid_perm_bold(floor_ptr, y, x);
                }
        }
 

diff --git a/src/floor-save.c b/src/floor-save.c
index b98aa10..485d619 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -364,7 +364,7 @@ static void build_dead_end(floor_type *floor_ptr)
                for (x = 0; x < MAX_WID; x++)
                {
                        /* Create "solid" perma-wall */
-                       place_solid_perm_bold(y, x);
+                       place_solid_perm_bold(floor_ptr, y, x);
                }
        }
 

diff --git a/src/grid.h b/src/grid.h
index 11d1911..75903ce 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -279,11 +279,11 @@ typedef struct
        if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
-#define place_solid_perm_bold(Y, X) \
+#define place_solid_perm_bold(F, Y, X) \
 { \
-       set_cave_feat(floor_ptr, Y,X,feat_permanent); \
-       p_ptr->current_floor_ptr->grid_array[Y][X].info &= ~(CAVE_MASK); \
-       add_cave_info(p_ptr->current_floor_ptr, Y,X,CAVE_SOLID); \
+       set_cave_feat(F, Y, X, feat_permanent); \
+       F->grid_array[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(F, Y, X, CAVE_SOLID); \
        delete_monster(Y, X); \
 }