塔のクエストの情報がダンプ等で間違った表示がされていたバグ修正。

q_info_j.txt を読む前に quest[].info を使っていたため正しい値になっていなかった。

diff --git a/src/cmd4.c b/src/cmd4.c
index 72d81cb..baf9435 100644 (file)
--- 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 d1a8092..3e05144 100644 (file)
--- 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 */