| Revision | 2a0a007ce22097fd5a251e8691f53d761edfa679 (tree) |
|---|---|
| Zeit | 2019-10-18 19:15:30 |
| Autor | deskull <deskull@user...> |
| Commiter | deskull |
[Refactor] #38997 build_type9() に floor_type * 引数を追加． / Add floor_type * argument to build_type9().
src/rooms-fractal.c (diff) src/rooms.c (diff)| @@ -10,7 +10,7 @@ | ||
| 10 | 10 | * @brief タイプ9の部屋…フラクタルカーブによる洞窟生成 / Type 9 -- Driver routine to create fractal p_ptr->current_floor_ptr->grid_array system |
| 11 | 11 | * @return なし |
| 12 | 12 | */ |
| 13 | -bool build_type9(void) | |
| 13 | +bool build_type9(floor_type *floor_ptr) | |
| 14 | 14 | { |
| 15 | 15 | int grd, roug, cutoff; |
| 16 | 16 | POSITION xsize, ysize, y0, x0; |
| @@ -35,14 +35,14 @@ bool build_type9(void) | ||
| 35 | 35 | * Still no space?! |
| 36 | 36 | * Try normal room |
| 37 | 37 | */ |
| 38 | - return build_type1(p_ptr->current_floor_ptr); | |
| 38 | + return build_type1(floor_ptr); | |
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | light = done = FALSE; |
| 43 | 43 | room = TRUE; |
| 44 | 44 | |
| 45 | - if ((p_ptr->current_floor_ptr->dun_level <= randint1(25)) && !(d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS)) light = TRUE; | |
| 45 | + if ((floor_ptr->dun_level <= randint1(25)) && !(d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS)) light = TRUE; | |
| 46 | 46 | |
| 47 | 47 | while (!done) |
| 48 | 48 | { |
| @@ -60,10 +60,10 @@ bool build_type9(void) | ||
| 60 | 60 | randint1(xsize / 4) + randint1(ysize / 4); |
| 61 | 61 | |
| 62 | 62 | /* make it */ |
| 63 | - generate_hmap(p_ptr->current_floor_ptr, y0, x0, xsize, ysize, grd, roug, cutoff); | |
| 63 | + generate_hmap(floor_ptr, y0, x0, xsize, ysize, grd, roug, cutoff); | |
| 64 | 64 | |
| 65 | 65 | /* Convert to normal format + clean up */ |
| 66 | - done = generate_fracave(p_ptr->current_floor_ptr, y0, x0, xsize, ysize, cutoff, light, room); | |
| 66 | + done = generate_fracave(floor_ptr, y0, x0, xsize, ysize, cutoff, light, room); | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | return TRUE; |
| @@ -1604,7 +1604,7 @@ void build_room(floor_type *floor_ptr, POSITION x1, POSITION x2, POSITION y1, PO | ||
| 1604 | 1604 | * is the randint0(3) below; it governs the relative density of |
| 1605 | 1605 | * twists and turns in the labyrinth: smaller number, more twists. |
| 1606 | 1606 | */ |
| 1607 | -void r_visit(floor_type *floor_ptr, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIRECTION dir, int *visited) | |
| 1607 | +void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIRECTION dir, int *visited) | |
| 1608 | 1608 | { |
| 1609 | 1609 | int i, j, m, n, temp, x, y, adj[4]; |
| 1610 | 1610 |
Fork