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

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 95423b5..3601e25 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -636,7 +636,7 @@ static bool cave_gen(floor_type *floor_ptr)
                {
                        for (x = 0; x < floor_ptr->width; x++)
                        {
-                               place_floor_bold(y, x);
+                               place_floor_bold(floor_ptr, y, x);
                        }
                }
 
@@ -1810,7 +1810,7 @@ static bool set_tunnel(floor_type *floor_ptr, POSITION *x, POSITION *y, bool aff
                /* Clear mimic type */
                floor_ptr->grid_array[*y][*x].mimic = 0;
 
-               place_floor_bold(*y, *x);
+               place_floor_bold(floor_ptr, *y, *x);
 
                return TRUE;
        }

diff --git a/src/floor-save.c b/src/floor-save.c
index 140ba08..b6b3760 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -373,7 +373,7 @@ static void build_dead_end(floor_type *floor_ptr)
        p_ptr->x = floor_ptr->width / 2;
 
        /* Give one square */
-       place_floor_bold(p_ptr->y, p_ptr->x);
+       place_floor_bold(floor_ptr, p_ptr->y, p_ptr->x);
 
        wipe_generate_random_floor_flags(floor_ptr);
 }

diff --git a/src/floor.c b/src/floor.c
index 3a90074..17c5571 100644 (file)
--- a/src/floor.c
+++ b/src/floor.c
@@ -28,7 +28,7 @@ void place_locked_door(floor_type *floor_ptr, POSITION y, POSITION x)
 {
        if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_NO_DOORS)
        {
-               place_floor_bold(y, x);
+               place_floor_bold(floor_ptr, y, x);
        }
        else
        {
@@ -50,7 +50,7 @@ void place_secret_door(floor_type *floor_ptr, POSITION y, POSITION x, int type)
 {
        if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_NO_DOORS)
        {
-               place_floor_bold(y, x);
+               place_floor_bold(floor_ptr, y, x);
        }
        else
        {

diff --git a/src/grid.c b/src/grid.c
index b30db89..7a14619 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -253,7 +253,7 @@ void place_random_door(POSITION y, POSITION x, bool room)
 
        if (d_info[p_ptr->dungeon_idx].flags1 & DF1_NO_DOORS)
        {
-               place_floor_bold(y, x);
+               place_floor_bold(p_ptr->current_floor_ptr, y, x);
                return;
        }
 
@@ -312,7 +312,7 @@ void place_random_door(POSITION y, POSITION x, bool room)
                }
                else
                {
-                       place_floor_bold(y, x);
+                       place_floor_bold(p_ptr->current_floor_ptr, y, x);
                }
        }
 
@@ -333,7 +333,7 @@ void place_closed_door(POSITION y, POSITION x, int type)
 
        if (d_info[p_ptr->dungeon_idx].flags1 & DF1_NO_DOORS)
        {
-               place_floor_bold(y, x);
+               place_floor_bold(p_ptr->current_floor_ptr, y, x);
                return;
        }
 
@@ -370,7 +370,7 @@ void place_closed_door(POSITION y, POSITION x, int type)
        }
        else
        {
-               place_floor_bold(y, x);
+               place_floor_bold(p_ptr->current_floor_ptr, y, x);
        }
 }
 
@@ -493,7 +493,7 @@ void place_floor(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light)
        {
                for (x = x1 - 1; x <= x2 + 1; x++)
                {
-                       place_floor_bold(y, x);
+                       place_floor_bold(p_ptr->current_floor_ptr, y, x);
                        add_cave_info(p_ptr->current_floor_ptr, y, x, CAVE_ROOM);
                        if (light) add_cave_info(p_ptr->current_floor_ptr, y, x, CAVE_GLOW);
                }
@@ -734,7 +734,7 @@ void set_floor(POSITION x, POSITION y)
 
        /* Set to be floor if is a wall (don't touch lakes). */
        if (is_extra_bold(p_ptr->current_floor_ptr, y, x))
-               place_floor_bold(y, x);
+               place_floor_bold(p_ptr->current_floor_ptr, y, x);
 }
 
 /*!

diff --git a/src/grid.h b/src/grid.h
index 3b5653b..46a3e0f 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -120,11 +120,11 @@ typedef struct
 #define is_outer_grid(C) ((C)->info & CAVE_OUTER)
 #define is_solid_grid(C) ((C)->info & CAVE_SOLID)
 
-#define place_floor_bold(Y, X) \
+#define place_floor_bold(F, Y, X) \
 { \
-       set_cave_feat(p_ptr->current_floor_ptr, Y,X,feat_ground_type[randint0(100)]); \
-       p_ptr->current_floor_ptr->grid_array[Y][X].info &= ~(CAVE_MASK); \
-       add_cave_info(p_ptr->current_floor_ptr, Y,X,CAVE_FLOOR); \
+       set_cave_feat((F), Y,X,feat_ground_type[randint0(100)]); \
+       (F)->grid_array[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info((F), Y,X,CAVE_FLOOR); \
        delete_monster(Y, X); \
 }
 

diff --git a/src/rooms-normal.c b/src/rooms-normal.c
index bb540bb..da2af3a 100644 (file)
--- a/src/rooms-normal.c
+++ b/src/rooms-normal.c
@@ -933,7 +933,7 @@ bool build_type11(floor_type *floor_ptr)
                        if (distance(y0, x0, y, x) <= rad - 1)
                        {
                                /* inside- so is floor */
-                               place_floor_bold(y, x);
+                               place_floor_bold(floor_ptr, y, x);
                        }
                        else if (distance(y0, x0, y, x) <= rad + 1)
                        {
@@ -991,11 +991,11 @@ bool build_type12(floor_type *floor_ptr)
                        if (dist2(y0, x0, y, x, h1, h2, h3, h4) <= rad - 1)
                        {
                                /* inside - so is floor */
-                               place_floor_bold(y, x);
+                               place_floor_bold(floor_ptr, y, x);
                        }
                        else if (distance(y0, x0, y, x) < 3)
                        {
-                               place_floor_bold(y, x);
+                               place_floor_bold(floor_ptr, y, x);
                        }
                        else
                        {

diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index 39f7e3d..6d2d7b4 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -930,12 +930,12 @@ bool build_type13(floor_type *floor_ptr)
        {
                for (y = y1; y <= yval; y++)
                {
-                       place_floor_bold(y, x2);
+                       place_floor_bold(floor_ptr, y, x2);
                        place_solid_bold(y, x1 - 1);
                }
                for (y = yval; y <= y2 + 1; y++)
                {
-                       place_floor_bold(y, x1);
+                       place_floor_bold(floor_ptr, y, x1);
                        place_solid_bold(y, x2 + 1);
                }
        }
@@ -943,12 +943,12 @@ bool build_type13(floor_type *floor_ptr)
        {
                for (y = yval; y <= y2 + 1; y++)
                {
-                       place_floor_bold(y, x1);
+                       place_floor_bold(floor_ptr, y, x1);
                        place_solid_bold(y, x2 + 1);
                }
                for (y = y1; y <= yval; y++)
                {
-                       place_floor_bold(y, x2);
+                       place_floor_bold(floor_ptr, y, x2);
                        place_solid_bold(y, x1 - 1);
                }
        }

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index e17216f..5c3267b 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -148,7 +148,7 @@ static void build_bubble_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
                        else
                        {
                                /* middle of a bubble */
-                               place_floor_bold(y0 - yhsize + y, x0 - xhsize + x);
+                               place_floor_bold(floor_ptr, y0 - yhsize + y, x0 - xhsize + x);
                        }
 
                        /* clean up rest of flags */
@@ -843,7 +843,7 @@ static void build_target_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
                        if (dist2(y0, x0, y, x, h1, h2, h3, h4) <= rad - 1)
                        {
                                /* inside- so is floor */
-                               place_floor_bold(y, x);
+                               place_floor_bold(floor_ptr, y, x);
                        }
                        else
                        {
@@ -900,7 +900,7 @@ static void build_target_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
                place_inner_bold(floor_ptr, y0 + 1, x);
        }
 
-       place_floor_bold(y0, x0);
+       place_floor_bold(floor_ptr, y0, x0);
 
 
        /* Add doors to vault */
@@ -1170,7 +1170,7 @@ static void build_castle_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
                {
                        floor_ptr->grid_array[y][x].info |= (CAVE_ROOM | CAVE_ICKY);
                        /* Make everything a floor */
-                       place_floor_bold(y, x);
+                       place_floor_bold(floor_ptr, y, x);
                }
        }
 

diff --git a/src/rooms.c b/src/rooms.c
index 801d2c6..b623020 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -192,7 +192,7 @@ void build_small_room(floor_type *floor_ptr, POSITION x0, POSITION y0)
        floor_ptr->grid_array[y0][x0].mimic = 0;
 
        /* Add inner open space */
-       place_floor_bold(y0, x0);
+       place_floor_bold(floor_ptr, y0, x0);
 }
 
 /*!
@@ -1266,7 +1266,7 @@ bool generate_lake(floor_type *floor_ptr, POSITION y0, POSITION x0, POSITION xsi
                {
                        for (y = 0; y <= ysize; ++y)
                        {
-                               place_floor_bold(y0 + y - yhsize, x0 + x - xhsize);
+                               place_floor_bold(floor_ptr, y0 + y - yhsize, x0 + x - xhsize);
                                floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY);
                        }
                }
@@ -1573,7 +1573,7 @@ void build_room(floor_type *floor_ptr, POSITION x1, POSITION x2, POSITION y1, PO
                        if (is_extra_bold(floor_ptr, y1+y, x1+x))
                        {
                                /* clear the untouched region */
-                               place_floor_bold(y1 + y, x1 + x);
+                               place_floor_bold(floor_ptr, y1 + y, x1 + x);
                                floor_ptr->grid_array[y1 + y][x1 + x].info |= (CAVE_ROOM | CAVE_ICKY);
                        }
                        else
@@ -1617,7 +1617,7 @@ void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIREC
        visited[node] = 1;
        x = 2 * (node % m) + x1;
        y = 2 * (node / m) + y1;
-       place_floor_bold(y, x);
+       place_floor_bold(p_ptr->current_floor_ptr, y, x);
 
        /* setup order of adjacent node visits */
        if (one_in_(3))
@@ -1657,7 +1657,7 @@ void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIREC
                                /* (0,+) - check for bottom boundary */
                                if ((node / m < n - 1) && (visited[node + m] == 0))
                                {
-                                       place_floor_bold(y + 1, x);
+                                       place_floor_bold(p_ptr->current_floor_ptr, y + 1, x);
                                        r_visit(y1, x1, y2, x2, node + m, dir, visited);
                                }
                                break;
@@ -1665,7 +1665,7 @@ void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIREC
                                /* (0,-) - check for top boundary */
                                if ((node / m > 0) && (visited[node - m] == 0))
                                {
-                                       place_floor_bold(y - 1, x);
+                                       place_floor_bold(p_ptr->current_floor_ptr, y - 1, x);
                                        r_visit(y1, x1, y2, x2, node - m, dir, visited);
                                }
                                break;
@@ -1673,7 +1673,7 @@ void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIREC
                                /* (+,0) - check for right boundary */
                                if ((node % m < m - 1) && (visited[node + 1] == 0))
                                {
-                                       place_floor_bold(y, x + 1);
+                                       place_floor_bold(p_ptr->current_floor_ptr, y, x + 1);
                                        r_visit(y1, x1, y2, x2, node + 1, dir, visited);
                                }
                                break;
@@ -1681,7 +1681,7 @@ void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIREC
                                /* (-,0) - check for left boundary */
                                if ((node % m > 0) && (visited[node - 1] == 0))
                                {
-                                       place_floor_bold(y, x - 1);
+                                       place_floor_bold(p_ptr->current_floor_ptr, y, x - 1);
                                        r_visit(y1, x1, y2, x2, node - 1, dir, visited);
                                }
                } /* end switch */
@@ -1825,15 +1825,15 @@ void build_recursive_room(floor_type *floor_ptr, POSITION x1, POSITION y1, POSIT
                        {
                                /* left and right */
                                y = randint1(ysize) + y1;
-                               place_floor_bold(y, x1);
-                               place_floor_bold(y, x2);
+                               place_floor_bold(floor_ptr, y, x1);
+                               place_floor_bold(floor_ptr, y, x2);
                        }
                        else
                        {
                                /* top and bottom */
                                x = randint1(xsize) + x1;
-                               place_floor_bold(y1, x);
-                               place_floor_bold(y2, x);
+                               place_floor_bold(floor_ptr, y1, x);
+                               place_floor_bold(floor_ptr, y2, x);
                        }
 
                        /* Select size of keep */
@@ -1901,12 +1901,12 @@ void build_recursive_room(floor_type *floor_ptr, POSITION x1, POSITION y1, POSIT
                        if (one_in_(2))
                        {
                                /* left */
-                               place_floor_bold(y, x1 + 1);
+                               place_floor_bold(floor_ptr, y, x1 + 1);
                        }
                        else
                        {
                                /* right */
-                               place_floor_bold(y, x2 - 1);
+                               place_floor_bold(floor_ptr, y, x2 - 1);
                        }
 
                        /* Build the room */