From 3011c999c3d5a4c7761b8dd6f543cfb257f051f7 Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 16 Mar 2018 22:22:10 +0900 Subject: [PATCH] =?utf8?q?max=5Fquests=20=E3=82=92=20max=5Fq=5Fidx=20?= =?utf8?q?=E3=81=AB=E6=94=B9=E5=90=8D=E3=80=82BGM=E9=81=B8=E6=8A=9E?= =?utf8?q?=E6=99=82=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=81=AE=E5=8F=82?= =?utf8?q?=E7=85=A7=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= =?utf8?q?=20/=20Rename=20max=5Fquest=20to=20man=5Fq=5Fidx,=20Fix=20proces?= =?utf8?q?s=20of=20quest=20BGM=20selection.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 2 +- src/bldg.c | 2 +- src/cmd4.c | 16 ++++++++-------- src/externs.h | 2 +- src/files.c | 8 ++++---- src/floors.c | 2 +- src/generate.c | 2 +- src/init1.c | 2 +- src/init2.c | 4 ++-- src/load.c | 4 ++-- src/main-win.c | 2 +- src/save.c | 4 ++-- src/util.c | 2 +- src/variable.c | 2 +- src/wild.c | 2 +- src/xtra2.c | 4 ++-- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/birth.c b/src/birth.c index 747a48610..45a5c0131 100644 --- a/src/birth.c +++ b/src/birth.c @@ -3267,7 +3267,7 @@ static void player_wipe_without_name(void) } /* Wipe the quests */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { quest_type* const q_ptr = &quest[i]; diff --git a/src/bldg.c b/src/bldg.c index c5bc79bab..85e70fd3e 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -4814,7 +4814,7 @@ IDX quest_number(DEPTH level) if (p_ptr->inside_quest) return (p_ptr->inside_quest); - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { if (quest[i].status != QUEST_STATUS_TAKEN) continue; diff --git a/src/cmd4.c b/src/cmd4.c index 1ba5d6da0..8c5740081 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -8014,7 +8014,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff) fprintf(fff, _("《遂行中のクエスト》\n", "< Current Quest >\n")); - for (i = 1; i < max_quests; i++) + for (i = 1; i < max_q_idx; i++) { if ((quest[i].status == QUEST_STATUS_TAKEN) || ((quest[i].status == QUEST_STATUS_STAGE_COMPLETED) && (quest[i].type == QUEST_TYPE_TOWER)) || @@ -8242,7 +8242,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[]) int total = 0; fprintf(fff, _("《達成したクエスト》\n", "< Completed Quest >\n")); - for (i = 1; i < max_quests; i++) + for (i = 1; i < max_q_idx; i++) { IDX q_idx = quest_num[i]; quest_type* const q_ptr = &quest[q_idx]; @@ -8266,7 +8266,7 @@ void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[]) int total = 0; fprintf(fff, _("《失敗したクエスト》\n", "< Failed Quest >\n")); - for (i = 1; i < max_quests; i++) + for (i = 1; i < max_q_idx; i++) { IDX q_idx = quest_num[i]; quest_type* const q_ptr = &quest[q_idx]; @@ -8291,7 +8291,7 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff) int total = 0; fprintf(fff, _("《残りのランダムクエスト》\n", "< Remaining Random Quest >\n")); - for (i = 1; i < max_quests; i++) + for (i = 1; i < max_q_idx; i++) { /* No info from "silent" quests */ if (quest[i].flags & QUEST_FLAG_SILENT) continue; @@ -8357,13 +8357,13 @@ static void do_cmd_knowledge_quests(void) } /* Allocate Memory */ - C_MAKE(quest_num, max_quests, IDX); + C_MAKE(quest_num, max_q_idx, IDX); /* Sort by compete level */ - for (i = 1; i < max_quests; i++) quest_num[i] = i; + for (i = 1; i < max_q_idx; i++) quest_num[i] = i; ang_sort_comp = ang_sort_comp_quest_num; ang_sort_swap = ang_sort_swap_quest_num; - ang_sort(quest_num, &dummy, max_quests); + ang_sort(quest_num, &dummy, max_q_idx); /* Dump Quest Information */ do_cmd_knowledge_quests_current(fff); @@ -8387,7 +8387,7 @@ static void do_cmd_knowledge_quests(void) fd_kill(file_name); /* Free Memory */ - C_KILL(quest_num, max_quests, IDX); + C_KILL(quest_num, max_q_idx, IDX); } diff --git a/src/externs.h b/src/externs.h index f3c1d29b9..e4373dd49 100644 --- a/src/externs.h +++ b/src/externs.h @@ -521,7 +521,7 @@ extern bool monk_armour_aux; extern bool monk_notify_aux; extern wilderness_type **wilderness; extern building_type building[MAX_BLDG]; -extern QUEST_IDX max_quests; +extern QUEST_IDX max_q_idx; extern MONRACE_IDX max_r_idx; extern IDX max_k_idx; extern IDX max_v_idx; diff --git a/src/files.c b/src/files.c index 84d8e3075..31c045d3d 100644 --- a/src/files.c +++ b/src/files.c @@ -4434,13 +4434,13 @@ static void dump_aux_quest(FILE *fff) fprintf(fff, _("\n\n [クエスト情報]\n", "\n\n [Quest Information]\n")); /* Allocate Memory */ - C_MAKE(quest_num, max_quests, IDX); + C_MAKE(quest_num, max_q_idx, IDX); /* Sort by compete level */ - for (i = 1; i < max_quests; i++) quest_num[i] = i; + for (i = 1; i < max_q_idx; i++) quest_num[i] = i; ang_sort_comp = ang_sort_comp_quest_num; ang_sort_swap = ang_sort_swap_quest_num; - ang_sort(quest_num, &dummy, max_quests); + ang_sort(quest_num, &dummy, max_q_idx); /* Dump Quest Information */ fputc('\n', fff); @@ -4450,7 +4450,7 @@ static void dump_aux_quest(FILE *fff) fputc('\n', fff); /* Free Memory */ - C_KILL(quest_num, max_quests, IDX); + C_KILL(quest_num, max_q_idx, IDX); } diff --git a/src/floors.c b/src/floors.c index 009dc00f7..21c9a4e47 100644 --- a/src/floors.c +++ b/src/floors.c @@ -890,7 +890,7 @@ void leave_floor(void) /* Search the quest monster index */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { if ((quest[i].status == QUEST_STATUS_TAKEN) && ((quest[i].type == QUEST_TYPE_KILL_LEVEL) || diff --git a/src/generate.c b/src/generate.c index dc361de0e..c7b4bb792 100644 --- a/src/generate.c +++ b/src/generate.c @@ -483,7 +483,7 @@ bool place_quest_monsters(void) int i; /* Handle the quest monster placements */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { monster_race *r_ptr; BIT_FLAGS mode; diff --git a/src/init1.c b/src/init1.c index c69fb590c..3651e0e3f 100644 --- a/src/init1.c +++ b/src/init1.c @@ -4387,7 +4387,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in /* Maximum quests */ else if (zz[0][0] == 'Q') { - max_quests = (IDX)atoi(zz[1]); + max_q_idx = (IDX)atoi(zz[1]); } /* Maximum r_idx */ diff --git a/src/init2.c b/src/init2.c index d4a1ba68c..0a330c51d 100644 --- a/src/init2.c +++ b/src/init2.c @@ -1579,10 +1579,10 @@ static errr init_quests(void) /*** Prepare the quests ***/ /* Allocate the quests */ - C_MAKE(quest, max_quests, quest_type); + C_MAKE(quest, max_q_idx, quest_type); /* Set all quest to "untaken" */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { quest[i].status = QUEST_STATUS_UNTAKEN; } diff --git a/src/load.c b/src/load.c index ab5c9eda0..678ad7a1b 100644 --- a/src/load.c +++ b/src/load.c @@ -3583,7 +3583,7 @@ static errr rd_savefile_new_aux(void) } /* Incompatible save files */ - if (max_quests_load > max_quests) + if (max_quests_load > max_q_idx) { note(format(_("クエストが多すぎる(%u)！", "Too many (%u) quests!"), max_quests_load)); return (23); @@ -3591,7 +3591,7 @@ static errr rd_savefile_new_aux(void) for (i = 0; i < max_quests_load; i++) { - if (i < max_quests) + if (i < max_q_idx) { quest_type* const q_ptr = &quest[i]; diff --git a/src/main-win.c b/src/main-win.c index dd33b1529..9913fd8ac 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -1538,7 +1538,7 @@ static void load_music_prefs(void) } } - for (i = 0; i < 1000; i++) /*!< @todo クエスト最大数指定 */ + for (i = 0; i < max_q_idx; i++) { sprintf(key, "quest%03d", i); GetPrivateProfileString("Quest", key, "", tmp, 1024, ini_path); diff --git a/src/save.c b/src/save.c index 2ad14a883..e2f4d19c9 100644 --- a/src/save.c +++ b/src/save.c @@ -1387,14 +1387,14 @@ static bool wr_savefile_new(void) wr_u16b(tmp16u); /* Dump the quests */ - tmp16u = max_quests; + tmp16u = max_q_idx; wr_u16b(tmp16u); /* Dump the quests */ tmp8u = MAX_RANDOM_QUEST-MIN_RANDOM_QUEST; wr_byte(tmp8u); - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { quest_type* const q_ptr = &quest[i]; diff --git a/src/util.c b/src/util.c index 8270bad08..f4143dfde 100644 --- a/src/util.c +++ b/src/util.c @@ -1760,7 +1760,7 @@ void select_floor_music(void) return; } - for(i = 0; i < max_quests; i++) + for(i = 0; i < max_q_idx; i++) { // TODO マクロで類似条件を統合すること if(quest[i].status == QUEST_STATUS_TAKEN && (quest[i].type == QUEST_TYPE_KILL_LEVEL || quest[i].type == QUEST_TYPE_RANDOM) && diff --git a/src/variable.c b/src/variable.c index f56a73d5d..6cbbd83c1 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1051,7 +1051,7 @@ building_type building[MAX_BLDG]; /* * Maximum number of quests */ -QUEST_IDX max_quests; +QUEST_IDX max_q_idx; /* * Maximum number of monsters in r_info.txt diff --git a/src/wild.c b/src/wild.c index 89ae00bd7..3804b8088 100644 --- a/src/wild.c +++ b/src/wild.c @@ -678,7 +678,7 @@ void wilderness_gen(void) set_floor_and_wall(0); /* Set rewarded quests to finished */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { if (quest[i].status == QUEST_STATUS_REWARDED) quest[i].status = QUEST_STATUS_FINISHED; diff --git a/src/xtra2.c b/src/xtra2.c index c0332fe1b..3011542ea 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -481,7 +481,7 @@ void check_quest_completion(monster_type *m_ptr) { int i; - for (i = max_quests - 1; i > 0; i--) + for (i = max_q_idx - 1; i > 0; i--) { quest_type* const q_ptr = &quest[i]; @@ -680,7 +680,7 @@ void check_find_art_quest_completion(object_type *o_ptr) { int i; /* Check if completed a quest */ - for (i = 0; i < max_quests; i++) + for (i = 0; i < max_q_idx; i++) { if ((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) && (quest[i].status == QUEST_STATUS_TAKEN) && -- 2.11.0