From 6222a4a9702d2a489fd2cf4b3804dc12ea2f963c Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 21 Dec 2019 18:56:20 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20place=5Fsolid=5Fperm=5Fbol?= =?utf8?q?d()=20=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20floor=5Ftype=20*=20argum?= =?utf8?q?ent=20to=20place=5Fsolid=5Fperm=5Fbold().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-generate.c | 6 +++--- src/floor-save.c | 2 +- src/grid.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/floor-generate.c b/src/floor-generate.c index 65ae70d4c..1c7a3faa8 100644 --- 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 b98aa108c..485d619f0 100644 --- 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 11d191157..75903ce8d 100644 --- 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); \ } -- 2.11.0