From 31663553658ba271f603078e85e5e99b57b6a02e Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 12 Jun 2019 22:22:02 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#39068=20locate=5Fconnected=5Fstair?= =?utf8?q?s()=20=E3=81=AE=20change=5Ffloor=5Fmode=20=E3=82=B0=E3=83=AD?= =?utf8?q?=E3=83=BC=E3=83=90=E3=83=AB=E5=8F=82=E7=85=A7=E3=82=92=E3=83=AD?= =?utf8?q?=E3=83=BC=E3=82=AB=E3=83=AB=E5=BC=95=E6=95=B0=E3=81=AB=E5=8F=8E?= =?utf8?q?=E3=82=81=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/floor-save.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/floor-save.c b/src/floor-save.c index de00a3ac2..eae3e7dc7 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -762,7 +762,7 @@ static void get_out_monster(void) * @param sf_ptr 移動元の保存フロア構造体参照ポインタ * @return なし */ -static void locate_connected_stairs(saved_floor_type *sf_ptr) +static void locate_connected_stairs(saved_floor_type *sf_ptr, BIT_FLAGS prev_floor_mode) { POSITION x, y, sx = 0, sy = 0; POSITION x_table[20]; @@ -779,7 +779,7 @@ static void locate_connected_stairs(saved_floor_type *sf_ptr) feature_type *f_ptr = &f_info[g_ptr->feat]; bool ok = FALSE; - if (change_floor_mode & CFM_UP) + if (prev_floor_mode & CFM_UP) { if (have_flag(f_ptr->flags, FF_LESS) && have_flag(f_ptr->flags, FF_STAIRS) && !have_flag(f_ptr->flags, FF_SPECIAL)) @@ -796,7 +796,7 @@ static void locate_connected_stairs(saved_floor_type *sf_ptr) } } - else if (change_floor_mode & CFM_DOWN) + else if (prev_floor_mode & CFM_DOWN) { if (have_flag(f_ptr->flags, FF_MORE) && have_flag(f_ptr->flags, FF_STAIRS) && !have_flag(f_ptr->flags, FF_SPECIAL)) @@ -944,7 +944,7 @@ void leave_floor(void) /* Choose random stairs */ if ((change_floor_mode & CFM_RAND_CONNECT) && p_ptr->floor_id) { - locate_connected_stairs(sf_ptr); + locate_connected_stairs(sf_ptr, change_floor_mode); } /* Extract new dungeon level */ -- 2.11.0