From 7b62ee8025b10f4dfaacca7d3e537bf83ae33614 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 3 Nov 2019 21:43:24 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20wilderness=5Fgen=5Fsmall()?= =?utf8?q?=20=E3=81=AB=20player=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=20player=5Ftype=20*=20argu?= =?utf8?q?ment=20to=20wilderness=5Fgen=5Fsmall().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-generate.c | 2 +- src/wild.c | 10 +++++----- src/wild.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/floor-generate.c b/src/floor-generate.c index 009241dd9..98899fb26 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -1433,7 +1433,7 @@ void generate_floor(floor_type *floor_ptr) else if (!floor_ptr->dun_level) { /* Make the wilderness */ - if (p_ptr->wild_mode) wilderness_gen_small(floor_ptr); + if (p_ptr->wild_mode) wilderness_gen_small(p_ptr, floor_ptr); else wilderness_gen(floor_ptr); } diff --git a/src/wild.c b/src/wild.c index 50070db3c..c842e3334 100644 --- a/src/wild.c +++ b/src/wild.c @@ -710,7 +710,7 @@ static s16b conv_terrain2feat[MAX_WILDERNESS]; * Build the wilderness area. -DG- * @return なし */ -void wilderness_gen_small(floor_type *floor_ptr) +void wilderness_gen_small(player_type *creature_ptr, floor_type *floor_ptr) { int i, j; @@ -733,7 +733,7 @@ void wilderness_gen_small(floor_type *floor_ptr) floor_ptr->grid_array[j][i].special = (s16b)wilderness[j][i].town; } else if (wilderness[j][i].road) floor_ptr->grid_array[j][i].feat = feat_floor; - else if (wilderness[j][i].entrance && (p_ptr->total_winner || !(d_info[wilderness[j][i].entrance].flags1 & DF1_WINNER))) + else if (wilderness[j][i].entrance && (creature_ptr->total_winner || !(d_info[wilderness[j][i].entrance].flags1 & DF1_WINNER))) { floor_ptr->grid_array[j][i].feat = feat_entrance; floor_ptr->grid_array[j][i].special = (byte)wilderness[j][i].entrance; @@ -753,9 +753,9 @@ void wilderness_gen_small(floor_type *floor_ptr) panel_row_min = floor_ptr->height; panel_col_min = floor_ptr->width; - p_ptr->x = p_ptr->wilderness_x; - p_ptr->y = p_ptr->wilderness_y; - p_ptr->town_num = 0; + creature_ptr->x = creature_ptr->wilderness_x; + creature_ptr->y = creature_ptr->wilderness_y; + creature_ptr->town_num = 0; } diff --git a/src/wild.h b/src/wild.h index 87325a179..7da9360a1 100644 --- a/src/wild.h +++ b/src/wild.h @@ -27,7 +27,7 @@ /* wild.c */ extern void set_floor_and_wall(DUNGEON_IDX type); extern void wilderness_gen(floor_type *floor_ptr); -extern void wilderness_gen_small(floor_type *floor_ptr); +extern void wilderness_gen_small(player_type *creature_ptr, floor_type *floor_ptr); extern errr init_wilderness(void); extern void init_wilderness_terrains(void); extern void seed_wilderness(void); -- 2.11.0