From 9dd3aaf17524ee2ffd3b2256bc1106e08708977b Mon Sep 17 00:00:00 2001 From: mogami Date: Thu, 5 Sep 2002 18:05:07 +0000 Subject: [PATCH] =?utf8?q?=E5=A1=94=E3=81=AE=E3=82=AF=E3=82=A8=E3=82=B9?= =?utf8?q?=E3=83=88=E3=81=AE=E6=83=85=E5=A0=B1=E3=81=8C=E3=83=80=E3=83=B3?= =?utf8?q?=E3=83=97=E7=AD=89=E3=81=A7=E9=96=93=E9=81=95=E3=81=A3=E3=81=9F?= =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=8C=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=E3=80=82=20q=5Finf?= =?utf8?q?o=5Fj.txt=20=E3=82=92=E8=AA=AD=E3=82=80=E5=89=8D=E3=81=AB=20ques?= =?utf8?q?t[].info=20=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=81=9F=E3=82=81=E6=AD=A3=E3=81=97=E3=81=84=E5=80=A4?= =?utf8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?= =?utf8?q?=E3=81=A3=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd4.c | 38 +++++++++++++++++++------------------- src/files.c | 28 ++++++++++++++-------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/cmd4.c b/src/cmd4.c index 72d81cbef..baf9435ab 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -7070,9 +7070,6 @@ static void do_cmd_knowledge_quests(void) for (i = 1; i < max_quests; i++) { - /* No info from "silent" quests */ - if (quest[i].flags & QUEST_FLAG_SILENT) continue; - if (quest[i].status == QUEST_STATUS_TAKEN || quest[i].status == QUEST_STATUS_COMPLETED) { int old_quest; @@ -7086,8 +7083,6 @@ static void do_cmd_knowledge_quests(void) quest_text_line = 0; - total++; - /* Set the quest number temporary */ old_quest = p_ptr->inside_quest; p_ptr->inside_quest = i; @@ -7100,6 +7095,11 @@ static void do_cmd_knowledge_quests(void) /* Reset the old quest number */ p_ptr->inside_quest = old_quest; + /* No info from "silent" quests */ + if (quest[i].flags & QUEST_FLAG_SILENT) continue; + + total++; + if (quest[i].type != QUEST_TYPE_RANDOM) { char note[80] = "\0"; @@ -7249,17 +7249,12 @@ sprintf(rand_tmp_str,"%s (%d total = 0; for (i = 1; i < max_quests; i++) { - /* No info from "silent" quests */ - if (quest[i].flags & QUEST_FLAG_SILENT) continue; - if (quest[i].status == QUEST_STATUS_FINISHED) { - int old_quest; - - total++; - if (i < MIN_RANDOM_QUEST) { + int old_quest; + /* Set the quest number temporary */ old_quest = p_ptr->inside_quest; p_ptr->inside_quest = i; @@ -7271,8 +7266,13 @@ sprintf(rand_tmp_str,"%s (%d /* Reset the old quest number */ p_ptr->inside_quest = old_quest; + + /* No info from "silent" quests */ + if (quest[i].flags & QUEST_FLAG_SILENT) continue; } + total++; + if ((i >= MIN_RANDOM_QUEST) && quest[i].r_idx) { /* Print the quest info */ @@ -7330,17 +7330,12 @@ sprintf(rand_tmp_str,"%s (%d total = 0; for (i = 1; i < max_quests; i++) { - /* No info from "silent" quests */ - if (quest[i].flags & QUEST_FLAG_SILENT) continue; - if ((quest[i].status == QUEST_STATUS_FAILED_DONE) || (quest[i].status == QUEST_STATUS_FAILED)) { - int old_quest; - - total++; - if (i < MIN_RANDOM_QUEST) { + int old_quest; + /* Set the quest number temporary */ old_quest = p_ptr->inside_quest; p_ptr->inside_quest = i; @@ -7352,8 +7347,13 @@ sprintf(rand_tmp_str,"%s (%d /* Reset the old quest number */ p_ptr->inside_quest = old_quest; + + /* No info from "silent" quests */ + if (quest[i].flags & QUEST_FLAG_SILENT) continue; } + total++; + if ((i >= MIN_RANDOM_QUEST) && quest[i].r_idx) { /* Print the quest info */ diff --git a/src/files.c b/src/files.c index d1a8092d6..3e05144f1 100644 --- a/src/files.c +++ b/src/files.c @@ -4180,17 +4180,12 @@ errr make_character_dump(FILE *fff) { int num = quest_num[i]; - /* No info from "silent" quests */ - if (quest[num].flags & QUEST_FLAG_SILENT) continue; - if (quest[num].status == QUEST_STATUS_FINISHED) { - int old_quest; - - total++; - if (num < MIN_RANDOM_QUEST) { + int old_quest; + /* Set the quest number temporary */ old_quest = p_ptr->inside_quest; p_ptr->inside_quest = num; @@ -4202,8 +4197,13 @@ errr make_character_dump(FILE *fff) /* Reset the old quest number */ p_ptr->inside_quest = old_quest; + + /* No info from "silent" quests */ + if (quest[num].flags & QUEST_FLAG_SILENT) continue; } + total++; + if ((num >= MIN_RANDOM_QUEST) && quest[num].r_idx) { /* Print the quest info */ @@ -4261,17 +4261,12 @@ errr make_character_dump(FILE *fff) { int num = quest_num[i]; - /* No info from "silent" quests */ - if (quest[num].flags & QUEST_FLAG_SILENT) continue; - if ((quest[num].status == QUEST_STATUS_FAILED_DONE) || (quest[num].status == QUEST_STATUS_FAILED)) { - int old_quest; - - total++; - if (num < MIN_RANDOM_QUEST) { + int old_quest; + /* Set the quest number temporary */ old_quest = p_ptr->inside_quest; p_ptr->inside_quest = num; @@ -4283,8 +4278,13 @@ errr make_character_dump(FILE *fff) /* Reset the old quest number */ p_ptr->inside_quest = old_quest; + + /* No info from "silent" quests */ + if (quest[num].flags & QUEST_FLAG_SILENT) continue; } + total++; + if ((num >= MIN_RANDOM_QUEST) && quest[num].r_idx) { /* Print the quest info */ -- 2.11.0