From f834e52d0dbf4d2c54705b14d7d951a5094d898a Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 2 Jan 2020 08:40:40 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20do=5Fcmd=5Fknowledge=5Fque?= =?utf8?q?sts=5Faux()=20=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20floor=5Ftype=20?= =?utf8?q?*=20argument=20to=20do=5Fcmd=5Fknowledge=5Fquests=5Faux().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-dump.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 40f538ed7..29e612e1c 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6602,7 +6602,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) } -static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx) +static bool do_cmd_knowledge_quests_aux(FILE *fff, floor_type *floor_ptr, IDX q_idx) { char tmp_str[120]; char playtime_str[16]; @@ -6611,9 +6611,9 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx) if (is_fixed_quest_idx(q_idx)) { /* Set the quest number temporary */ - IDX old_quest = p_ptr->current_floor_ptr->inside_quest; + IDX old_quest = floor_ptr->inside_quest; - p_ptr->current_floor_ptr->inside_quest = q_idx; + floor_ptr->inside_quest = q_idx; /* Get the quest */ init_flags = INIT_NAME_ONLY; @@ -6621,7 +6621,7 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx) process_dungeon_file("q_info.txt", 0, 0, 0, 0); /* Reset the old quest number */ - p_ptr->current_floor_ptr->inside_quest = old_quest; + floor_ptr->inside_quest = old_quest; /* No info from "silent" quests */ if (q_ptr->flags & QUEST_FLAG_SILENT) return FALSE; @@ -6680,7 +6680,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]) QUEST_IDX q_idx = quest_num[i]; quest_type* const q_ptr = &quest[q_idx]; - if (q_ptr->status == QUEST_STATUS_FINISHED && do_cmd_knowledge_quests_aux(fff, q_idx)) + if (q_ptr->status == QUEST_STATUS_FINISHED && do_cmd_knowledge_quests_aux(fff, p_ptr->current_floor_ptr, q_idx)) { ++total; } @@ -6704,7 +6704,7 @@ void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]) quest_type* const q_ptr = &quest[q_idx]; if (((q_ptr->status == QUEST_STATUS_FAILED_DONE) || (q_ptr->status == QUEST_STATUS_FAILED)) && - do_cmd_knowledge_quests_aux(fff, q_idx)) + do_cmd_knowledge_quests_aux(fff, p_ptr->current_floor_ptr, q_idx)) { ++total; } -- 2.11.0