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

diff --git a/src/floor.c b/src/floor.c
index 0dfc928..21f7342 100644 (file)
--- a/src/floor.c
+++ b/src/floor.c
@@ -226,8 +226,8 @@ void add_door(floor_type* floor_ptr, POSITION x, POSITION y)
                place_secret_door(floor_ptr, y, x, DOOR_DEFAULT);
 
                /* set boundarys so don't get wide doors */
-               place_solid_bold(y, x - 1);
-               place_solid_bold(y, x + 1);
+               place_solid_bold(floor_ptr, y, x - 1);
+               place_solid_bold(floor_ptr, y, x + 1);
        }
 
 
@@ -246,8 +246,8 @@ void add_door(floor_type* floor_ptr, POSITION x, POSITION y)
                place_secret_door(floor_ptr, y, x, DOOR_DEFAULT);
 
                /* set boundarys so don't get wide doors */
-               place_solid_bold(y - 1, x);
-               place_solid_bold(y + 1, x);
+               place_solid_bold(floor_ptr, y - 1, x);
+               place_solid_bold(floor_ptr, y + 1, x);
        }
 }
 

diff --git a/src/grid.h b/src/grid.h
index 723f5a9..d5bda31 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -260,11 +260,11 @@ typedef struct
        if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
 }
 
-#define place_solid_bold(Y, X) \
+#define place_solid_bold(F, Y, X) \
 { \
-       set_cave_feat(p_ptr->current_floor_ptr, Y,X,feat_wall_solid); \
-       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_wall_solid); \
+       F->grid_array[Y][X].info &= ~(CAVE_MASK); \
+       add_cave_info(F,Y,X,CAVE_SOLID); \
        delete_monster(Y, X); \
 }
 

diff --git a/src/rooms-normal.c b/src/rooms-normal.c
index 774458d..603800e 100644 (file)
--- a/src/rooms-normal.c
+++ b/src/rooms-normal.c
@@ -178,8 +178,8 @@ bool build_type1(floor_type *floor_ptr)
                        }
 
                        /* Prevent edge of wall from being tunneled */
-                       place_solid_bold(yval, x1 - 1);
-                       place_solid_bold(yval, x2 + 1);
+                       place_solid_bold(floor_ptr, yval, x1 - 1);
+                       place_solid_bold(floor_ptr, yval, x2 + 1);
                }
                else
                {
@@ -191,8 +191,8 @@ bool build_type1(floor_type *floor_ptr)
                        }
 
                        /* Prevent edge of wall from being tunneled */
-                       place_solid_bold(y1 - 1, xval);
-                       place_solid_bold(y2 + 1, xval);
+                       place_solid_bold(floor_ptr, y1 - 1, xval);
+                       place_solid_bold(floor_ptr, y2 + 1, xval);
                }
 
                place_random_door(floor_ptr, yval, xval, TRUE);

diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index bd6ed36..02f1b36 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -931,12 +931,12 @@ bool build_type13(floor_type *floor_ptr)
                for (y = y1; y <= yval; y++)
                {
                        place_floor_bold(floor_ptr, y, x2);
-                       place_solid_bold(y, x1 - 1);
+                       place_solid_bold(floor_ptr, y, x1 - 1);
                }
                for (y = yval; y <= y2 + 1; y++)
                {
                        place_floor_bold(floor_ptr, y, x1);
-                       place_solid_bold(y, x2 + 1);
+                       place_solid_bold(floor_ptr, y, x2 + 1);
                }
        }
        else
@@ -944,12 +944,12 @@ bool build_type13(floor_type *floor_ptr)
                for (y = yval; y <= y2 + 1; y++)
                {
                        place_floor_bold(floor_ptr, y, x1);
-                       place_solid_bold(y, x2 + 1);
+                       place_solid_bold(floor_ptr, y, x2 + 1);
                }
                for (y = y1; y <= yval; y++)
                {
                        place_floor_bold(floor_ptr, y, x2);
-                       place_solid_bold(y, x1 - 1);
+                       place_solid_bold(floor_ptr, y, x1 - 1);
                }
        }