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

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 7c98a5b..d4a387e 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -1175,7 +1175,7 @@ static void build_castle_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
        }
 
        /* Make the castle */
-       build_recursive_room(x1, y1, x2, y2, randint1(5));
+       build_recursive_room(floor_ptr, x1, y1, x2, y2, randint1(5));
 
        /* Fill with monsters and treasure, low difficulty */
        fill_treasure(floor_ptr, x1, x2, y1, y2, randint1(3));

diff --git a/src/rooms.c b/src/rooms.c
index 0925994..a194582 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -1759,7 +1759,7 @@ void build_maze_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize,
  * The power variable is a measure of how well defended a region is.
  * This alters the possible choices.
  */
-void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, int power)
+void build_recursive_room(floor_type *floor_ptr, POSITION x1, POSITION y1, POSITION x2, POSITION y2, int power)
 {
        POSITION xsize, ysize;
        POSITION x, y;
@@ -1844,12 +1844,12 @@ void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in
                        /* Do outside areas */
 
                        /* Above and below keep */
-                       build_recursive_room(x1 + 1, y1 + 1, x2 - 1, t1, power + 1);
-                       build_recursive_room(x1 + 1, t2, x2 - 1, y2, power + 1);
+                       build_recursive_room(floor_ptr, x1 + 1, y1 + 1, x2 - 1, t1, power + 1);
+                       build_recursive_room(floor_ptr, x1 + 1, t2, x2 - 1, y2, power + 1);
 
                        /* Left and right of keep */
-                       build_recursive_room(x1 + 1, t1 + 1, t3, t2 - 1, power + 3);
-                       build_recursive_room(t4, t1 + 1, x2 - 1, t2 - 1, power + 3);
+                       build_recursive_room(floor_ptr, x1 + 1, t1 + 1, t3, t2 - 1, power + 3);
+                       build_recursive_room(floor_ptr, t4, t1 + 1, x2 - 1, t2 - 1, power + 3);
 
                        /* Make the keep itself: */
                        x1 = t3;
@@ -1909,7 +1909,7 @@ void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in
                        }
 
                        /* Build the room */
-                       build_recursive_room(x1 + 2, y1 + 2, x2 - 2, y2 - 2, power + 3);
+                       build_recursive_room(floor_ptr, x1 + 2, y1 + 2, x2 - 2, y2 - 2, power + 3);
                        break;
                }
                case 2:
@@ -1929,8 +1929,8 @@ void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in
                        }
 
                        t1 = randint1(xsize - 2) + x1 + 1;
-                       build_recursive_room(x1, y1, t1, y2, power - 2);
-                       build_recursive_room(t1 + 1, y1, x2, y2, power - 2);
+                       build_recursive_room(floor_ptr, x1, y1, t1, y2, power - 2);
+                       build_recursive_room(floor_ptr, t1 + 1, y1, x2, y2, power - 2);
                        break;
                }
                case 3:
@@ -1950,8 +1950,8 @@ void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in
                        }
 
                        t1 = randint1(ysize - 2) + y1 + 1;
-                       build_recursive_room(x1, y1, x2, t1, power - 2);
-                       build_recursive_room(x1, t1 + 1, x2, y2, power - 2);
+                       build_recursive_room(floor_ptr, x1, y1, x2, t1, power - 2);
+                       build_recursive_room(floor_ptr, x1, t1 + 1, x2, y2, power - 2);
                        break;
                }
        }

diff --git a/src/rooms.h b/src/rooms.h
index c9e370e..1fa8a3f 100644 (file)
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -100,6 +100,6 @@ extern void generate_hmap(floor_type *floor_ptr, POSITION y0, POSITION x0, POSIT
 extern bool generate_fracave(floor_type *floor_ptr, POSITION y0, POSITION x0, POSITION xsize, POSITION ysize, int cutoff, bool light, bool room);
 extern void fill_treasure(floor_type *floor_ptr, POSITION x1, POSITION x2, POSITION y1, POSITION y2, int difficulty);
 extern bool generate_lake(POSITION y0, POSITION x0, POSITION xsize, POSITION ysize, int c1, int c2, int c3, int type);
-extern void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, int power);
+extern void build_recursive_room(floor_type *floor_ptr, POSITION x1, POSITION y1, POSITION x2, POSITION y2, int power);
 extern void build_room(floor_type *floor_ptr, POSITION x1, POSITION x2, POSITION y1, POSITION y2);
 extern void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIRECTION dir, int *visited);