From 408ed958481bcf33d97dc5b7942f364971ce272d Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 5 Jan 2020 13:25:46 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20do=5Fcmd=5Fknowledge=5Fque?= =?utf8?q?sts=5Fcurrent()=20=E3=81=AB=20player=5Ftype=20*=20=E5=BC=95?= =?utf8?q?=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0=20/=20Add=20player=5Ftype?= =?utf8?q?=20*=20argument=20to=20do=5Fcmd=5Fknowledge=5Fquests=5Fcurrent()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-dump.c | 19 ++++++++++--------- src/cmd/cmd-dump.h | 4 ++-- src/core.c | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index fb8fed25f..5bbd98446 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6361,9 +6361,10 @@ static void do_cmd_knowledge_stat(player_type *creature_ptr) /* + * todo player_typeではなくQUEST_IDXを引数にすべきかもしれない * Print all active quests */ -static void do_cmd_knowledge_quests_current(FILE *fff) +static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff) { char tmp_str[120]; char rand_tmp_str[120] = "\0"; @@ -6383,13 +6384,13 @@ static void do_cmd_knowledge_quests_current(FILE *fff) continue; /* Set the quest number temporary */ - QUEST_IDX old_quest = p_ptr->current_floor_ptr->inside_quest; + QUEST_IDX old_quest = creature_ptr->current_floor_ptr->inside_quest; /* Clear the text */ for (int j = 0; j < 10; j++) quest_text[j][0] = '\0'; quest_text_line = 0; - p_ptr->current_floor_ptr->inside_quest = i; + creature_ptr->current_floor_ptr->inside_quest = i; /* Get the quest text */ init_flags = INIT_SHOW_TEXT; @@ -6397,7 +6398,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) process_dungeon_file("q_info.txt", 0, 0, 0, 0); /* Reset the old quest number */ - p_ptr->current_floor_ptr->inside_quest = old_quest; + creature_ptr->current_floor_ptr->inside_quest = old_quest; /* No info from "silent" quests */ if (quest[i].flags & QUEST_FLAG_SILENT) continue; @@ -6668,7 +6669,7 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff) /* * Print quest status of all active quests */ -static void do_cmd_knowledge_quests(void) +static void do_cmd_knowledge_quests(player_type *creature_ptr) { /* Open a new file */ FILE *fff; @@ -6691,7 +6692,7 @@ static void do_cmd_knowledge_quests(void) ang_sort(quest_num, &dummy, max_q_idx, ang_sort_comp_quest_num, ang_sort_swap_quest_num); /* Dump Quest Information */ - do_cmd_knowledge_quests_current(fff); + do_cmd_knowledge_quests_current(creature_ptr, fff); fputc('\n', fff); do_cmd_knowledge_quests_completed(fff, quest_num); fputc('\n', fff); @@ -6997,7 +6998,7 @@ void do_cmd_knowledge(player_type *creature_ptr) do_cmd_knowledge_dungeon(); break; case 'h': /* Quests */ - do_cmd_knowledge_quests(); + do_cmd_knowledge_quests(creature_ptr); break; case 'i': /* Autopick */ do_cmd_knowledge_autopick(); @@ -7017,14 +7018,14 @@ void do_cmd_knowledge(player_type *creature_ptr) /* * Check on the status of an active quest */ -void do_cmd_checkquest(void) +void do_cmd_checkquest(player_type *creature_ptr) { /* File type is "TEXT" */ FILE_TYPE(FILE_TYPE_TEXT); screen_save(); /* Quest info */ - do_cmd_knowledge_quests(); + do_cmd_knowledge_quests(creature_ptr); screen_load(); } diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h index 588ededf8..5ab6bbf1b 100644 --- a/src/cmd/cmd-dump.h +++ b/src/cmd/cmd-dump.h @@ -64,11 +64,11 @@ extern void do_cmd_version(void); extern void do_cmd_feeling(player_type *creature_ptr); extern void do_cmd_load_screen(void); extern void do_cmd_save_screen_html_aux(char *filename, int message); -extern void do_cmd_save_screen(void); +extern void do_cmd_save_screen(player_type *creature_ptr); extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]); extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]); extern void do_cmd_knowledge(player_type *creature_ptr); -extern void do_cmd_checkquest(void); +extern void do_cmd_checkquest(player_type *creature_ptr); extern void do_cmd_time(void); /* diff --git a/src/core.c b/src/core.c index d660d9596..e2df394c3 100644 --- a/src/core.c +++ b/src/core.c @@ -4178,7 +4178,7 @@ static void process_command(player_type *creature_ptr) /* Show quest status -KMW- */ case KTRL('Q'): { - do_cmd_checkquest(); + do_cmd_checkquest(creature_ptr); break; } -- 2.11.0