From fa1062e6712da353348119a448ace176993b0334 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 3 Nov 2019 08:11:26 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20generate=5Frandom=5Ffloor(?= =?utf8?q?)=20=E3=82=92=20generate=5Ffloor()=20=E3=81=AB=E6=94=B9=E5=90=8D?= =?utf8?q?=EF=BC=8E=20/=20Rename=20generate=5Frandom=5Ffloor()=20to=20gene?= =?utf8?q?rate=5Ffloor().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-generate.c | 2 +- src/floor-generate.h | 2 +- src/floor-save.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/floor-generate.c b/src/floor-generate.c index 3f10c2afd..009241dd9 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -1399,7 +1399,7 @@ void clear_cave(floor_type *floor_ptr) * @return なし * @note Hack -- regenerate any "overflow" levels */ -void generate_random_floor(floor_type *floor_ptr) +void generate_floor(floor_type *floor_ptr) { int num; diff --git a/src/floor-generate.h b/src/floor-generate.h index b826af62d..512868c85 100644 --- a/src/floor-generate.h +++ b/src/floor-generate.h @@ -103,7 +103,7 @@ extern dun_data *dun; extern bool place_quest_monsters(floor_type *floor_ptr); extern void wipe_generate_random_floor_flags(floor_type *floor_ptr); extern void clear_cave(floor_type *floor_ptr); -extern void generate_random_floor(floor_type *floor_ptr); +extern void generate_floor(floor_type *floor_ptr); extern bool build_tunnel(floor_type *floor_ptr, POSITION row1, POSITION col1, POSITION row2, POSITION col2); extern bool build_tunnel2(floor_type *floor_ptr, POSITION x1, POSITION y1, POSITION x2, POSITION y2, int type, int cutoff); diff --git a/src/floor-save.c b/src/floor-save.c index 5dbbe07ed..cab7a3776 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -1118,8 +1118,7 @@ void change_floor(player_type *creature_ptr) if (!(creature_ptr->change_floor_mode & CFM_SAVE_FLOORS) && !(creature_ptr->change_floor_mode & CFM_FIRST_FLOOR)) { - /* Create creature_ptr->current_floor_ptr->grid_array */ - generate_random_floor(creature_ptr->current_floor_ptr); + generate_floor(creature_ptr->current_floor_ptr); /* Paranoia -- No new saved floor */ new_floor_id = 0; @@ -1310,8 +1309,7 @@ void change_floor(player_type *creature_ptr) } else { - /* Newly create creature_ptr->current_floor_ptr->grid_array */ - generate_random_floor(creature_ptr->current_floor_ptr); + generate_floor(creature_ptr->current_floor_ptr); } /* Record last visit current_world_ptr->game_turn */ -- 2.11.0