From d8069600d5567d3f80891d9f21d5744c2dc9d614 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 13 Jun 2019 22:16:40 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#39076=20=E5=86=97=E9=95=B7?= =?utf8?q?=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A?= =?utf8?q?=E9=99=A4=20(/*=20Init=20the=20wilderness=20*/)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 10 +--------- src/wild.c | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/core.c b/src/core.c index b0ae3b3df..a3a071fd1 100644 --- a/src/core.c +++ b/src/core.c @@ -5345,7 +5345,7 @@ void play_game(bool new_game) /* Open the high score file, for reading/writing */ highscore_fd = fd_open(buf, O_RDWR); - /* 町名消失バグ対策(#38205) Init the wilderness */ + /* 町名消失バグ対策(#38205)のためここで世界マップ情報を読み出す */ process_dungeon_file("w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x); /* Handle score, show Top scores */ @@ -5531,25 +5531,17 @@ void play_game(bool new_game) /* Initialize the town-buildings if necessary */ if (!current_floor_ptr->dun_level && !p_ptr->inside_quest) { - /* Init the wilderness */ - process_dungeon_file("w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x); - - /* Init the town */ init_flags = INIT_ONLY_BUILDINGS; - process_dungeon_file("t_info.txt", 0, 0, MAX_HGT, MAX_WID); - select_floor_music(); } - /* Generate a dungeon level if needed */ if (!current_world_ptr->character_dungeon) { change_floor(p_ptr->change_floor_mode); } - else { /* HACK -- Restore from panic-save */ diff --git a/src/wild.c b/src/wild.c index 2a279a3b8..57fff5d45 100644 --- a/src/wild.c +++ b/src/wild.c @@ -484,10 +484,7 @@ void wilderness_gen(void) panel_row_min = current_floor_ptr->height; panel_col_min = current_floor_ptr->width; - /* Init the wilderness */ - process_dungeon_file("w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x); - x = p_ptr->wilderness_x; y = p_ptr->wilderness_y; get_mon_num_prep(get_monster_hook(), NULL); @@ -724,7 +721,6 @@ void wilderness_gen_small(void) current_floor_ptr->grid_array[j][i].feat = feat_permanent; } - /* Init the wilderness */ process_dungeon_file("w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x); /* Fill the map */ -- 2.11.0