From f0a0de6b505ac7496dcffb23441f47fb3781951c Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 20 Aug 2019 20:17:10 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20update=5Fdungeon=5Ffeeling?= =?utf8?q?()=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 2 +- src/floor-events.c | 10 +++++----- src/floor-events.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core.c b/src/core.c index b81ce8908..59d4a63be 100644 --- a/src/core.c +++ b/src/core.c @@ -3105,7 +3105,7 @@ static void process_world(void) extract_day_hour_min(&day, &hour, &min); /* Update dungeon feeling, and announce it if changed */ - update_dungeon_feeling(); + update_dungeon_feeling(current_floor_ptr); /* 帰還無しモード時のレベルテレポバグ対策 / Fix for level teleport bugs on ironman_downward.*/ if (ironman_downward && (p_ptr->dungeon_idx != DUNGEON_ANGBAND && p_ptr->dungeon_idx != 0)) diff --git a/src/floor-events.c b/src/floor-events.c index f5f2d25f4..3fd00df3d 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -273,26 +273,26 @@ byte get_dungeon_feeling(floor_type *floor_ptr) * / Update dungeon feeling, and announce it if changed * @return なし */ -void update_dungeon_feeling(void) +void update_dungeon_feeling(floor_type *floor_ptr) { byte new_feeling; int quest_num; int delay; /* No feeling on the surface */ - if (!current_floor_ptr->dun_level) return; + if (!floor_ptr->dun_level) return; /* No feeling in the arena */ if (p_ptr->phase_out) return; /* Extract delay time */ - delay = MAX(10, 150 - p_ptr->skill_fos) * (150 - current_floor_ptr->dun_level) * TURNS_PER_TICK / 100; + delay = MAX(10, 150 - p_ptr->skill_fos) * (150 - floor_ptr->dun_level) * TURNS_PER_TICK / 100; /* Not yet felt anything */ if (current_world_ptr->game_turn < p_ptr->feeling_turn + delay && !cheat_xtra) return; /* Extract quest number (if any) */ - quest_num = quest_number(current_floor_ptr->dun_level); + quest_num = quest_number(floor_ptr->dun_level); /* No feeling in a quest */ if (quest_num && @@ -302,7 +302,7 @@ void update_dungeon_feeling(void) /* Get new dungeon feeling */ - new_feeling = get_dungeon_feeling(current_floor_ptr); + new_feeling = get_dungeon_feeling(floor_ptr); /* Remember last time updated */ p_ptr->feeling_turn = current_world_ptr->game_turn; diff --git a/src/floor-events.h b/src/floor-events.h index 47e745c35..47cdb8da2 100644 --- a/src/floor-events.h +++ b/src/floor-events.h @@ -3,7 +3,7 @@ extern void day_break(void); extern void night_falls(void); extern MONSTER_NUMBER count_all_hostile_monsters(floor_type *floor_ptr); extern byte get_dungeon_feeling(floor_type *floor_ptr); -extern void update_dungeon_feeling(void); +extern void update_dungeon_feeling(floor_type *floor_ptr); extern void glow_deep_lava_and_bldg(void); extern void forget_lite(void); extern void update_lite(void); -- 2.11.0