From e4cbc9060fb121bf99cdc5ea4b2f1f6289c3ead7 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 30 Sep 2017 00:55:49 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd4.c | 15 ++++++++------- src/cmd6.c | 6 ++++-- src/externs.h | 4 ++-- src/init1.c | 22 +++++++++++----------- src/rooms.c | 3 ++- src/scores.c | 4 ++-- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/cmd4.c b/src/cmd4.c index ba8fb3a22..243e39c43 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -6325,8 +6325,8 @@ static void display_group_list(int col, int row, int wid, int per_page, /* * Move the cursor in a browser window */ -static void browser_cursor(char ch, int *column, IDX *grp_cur, IDX grp_cnt, - IDX *list_cur, IDX list_cnt) +static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt, + IDX *list_cur, int list_cnt) { int d; int col = *column; @@ -7452,9 +7452,10 @@ static void display_feature_list(int col, int row, int per_page, int *feat_idx, static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int direct_f_idx, int *lighting_level) { int i, len, max; - int grp_cur, grp_top, old_grp_cur; + IDX grp_cur, grp_top, old_grp_cur; IDX feat_cur, feat_top; - int grp_cnt, grp_idx[100]; + int grp_cnt; + IDX grp_idx[100]; int feat_cnt; int *feat_idx; @@ -8229,7 +8230,7 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx) /* * Print all finished quests */ -void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[]) +void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[]) { int i; int total = 0; @@ -8237,7 +8238,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[]) fprintf(fff, _("《達成したクエスト》\n", "< Completed Quest >\n")); for (i = 1; i < max_quests; i++) { - int q_idx = quest_num[i]; + IDX q_idx = quest_num[i]; quest_type* const q_ptr = &quest[q_idx]; if (q_ptr->status == QUEST_STATUS_FINISHED && @@ -8253,7 +8254,7 @@ void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[]) /* * Print all failed quests */ -void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[]) +void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[]) { int i; int total = 0; diff --git a/src/cmd6.c b/src/cmd6.c index fc5db8659..4f3a775a7 100644 --- a/src/cmd6.c +++ b/src/cmd6.c @@ -4583,7 +4583,9 @@ static int select_magic_eater(bool only_browse) */ bool do_cmd_magic_eater(bool only_browse, bool powerful) { - int item, chance, level, k_idx; + OBJECT_SUBTYPE_VALUE item; + int chance, level; + IDX k_idx; OBJECT_TYPE_VALUE tval; OBJECT_SUBTYPE_VALUE sval; bool use_charge = TRUE; @@ -4603,7 +4605,7 @@ bool do_cmd_magic_eater(bool only_browse, bool powerful) } if (item >= EATER_EXT*2) {tval = TV_ROD;sval = item - EATER_EXT*2;} else if (item >= EATER_EXT) {tval = TV_WAND;sval = item - EATER_EXT;} - else {tval = TV_STAFF;sval = item;} + else {tval = TV_STAFF; sval = item;} k_idx = lookup_kind(tval, sval); level = (tval == TV_ROD ? k_info[k_idx].level * 5 / 6 - 5 : k_info[k_idx].level); diff --git a/src/externs.h b/src/externs.h index a71743874..9ac09e928 100644 --- a/src/externs.h +++ b/src/externs.h @@ -782,8 +782,8 @@ extern void do_cmd_feeling(void); 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_knowledge_quests_completed(FILE *fff, int quest_num[]); -extern void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[]); +extern void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[]); +extern void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[]); extern bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b); extern void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b); extern void do_cmd_knowledge(void); diff --git a/src/init1.c b/src/init1.c index 44b76121b..67b888e06 100644 --- a/src/init1.c +++ b/src/init1.c @@ -1393,8 +1393,8 @@ errr parse_s_info(char *buf, header *head) || max < WEAPON_EXP_UNSKILLED || max > WEAPON_EXP_MASTER) return (8); /* Save the values */ - s_ptr->s_start[num] = start; - s_ptr->s_max[num] = max; + s_ptr->s_start[num] = (SUB_EXP)start; + s_ptr->s_max[num] = (SUB_EXP)max; } @@ -3156,7 +3156,7 @@ errr parse_r_info(char *buf, header *head) if (3 != sscanf(buf+2, "%d:%d:%d", &id, &rarity, &per)) return (1); r_ptr->artifact_id[i] = id; r_ptr->artifact_rarity[i] = (RARITY)rarity; - r_ptr->artifact_percent[i] = per; + r_ptr->artifact_percent[i] = (PERCENTAGE)per; } /* Process 'V' for "Arena power value ratio" */ @@ -3681,7 +3681,7 @@ static errr parse_line_feature(char *buf) if (zz[6][0] == '*') { letter[index].random |= RANDOM_ARTIFACT; - if (zz[6][1]) letter[index].artifact = atoi(zz[6] + 1); + if (zz[6][1]) letter[index].artifact = (IDX)atoi(zz[6] + 1); } else if (zz[6][0] == '!') { @@ -3692,7 +3692,7 @@ static errr parse_line_feature(char *buf) } else { - letter[index].artifact = atoi(zz[6]); + letter[index].artifact = (IDX)atoi(zz[6]); } /* Fall through */ /* Ego-item */ @@ -3700,11 +3700,11 @@ static errr parse_line_feature(char *buf) if (zz[5][0] == '*') { letter[index].random |= RANDOM_EGO; - if (zz[5][1]) letter[index].ego = atoi(zz[5] + 1); + if (zz[5][1]) letter[index].ego = (IDX)atoi(zz[5] + 1); } else { - letter[index].ego = atoi(zz[5]); + letter[index].ego = (IDX)atoi(zz[5]); } /* Fall through */ /* Object */ @@ -3712,7 +3712,7 @@ static errr parse_line_feature(char *buf) if (zz[4][0] == '*') { letter[index].random |= RANDOM_OBJECT; - if (zz[4][1]) letter[index].object = atoi(zz[4] + 1); + if (zz[4][1]) letter[index].object = (IDX)atoi(zz[4] + 1); } else if (zz[4][0] == '!') { @@ -3731,7 +3731,7 @@ static errr parse_line_feature(char *buf) } else { - letter[index].object = atoi(zz[4]); + letter[index].object = (IDX)atoi(zz[4]); } /* Fall through */ /* Monster */ @@ -3739,7 +3739,7 @@ static errr parse_line_feature(char *buf) if (zz[3][0] == '*') { letter[index].random |= RANDOM_MONSTER; - if (zz[3][1]) letter[index].monster = atoi(zz[3] + 1); + if (zz[3][1]) letter[index].monster = (IDX)atoi(zz[3] + 1); } else if (zz[3][0] == 'c') { @@ -3748,7 +3748,7 @@ static errr parse_line_feature(char *buf) } else { - letter[index].monster = atoi(zz[3]); + letter[index].monster = (IDX)atoi(zz[3]); } /* Fall through */ /* Cave info */ diff --git a/src/rooms.c b/src/rooms.c index 655bf7da5..acbfe541f 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -6462,7 +6462,8 @@ static bool precalc_ugarcade(int town_hgt, int town_wid, int n) */ static void build_stores(int ltcy, int ltcx, int stores[], int n) { - int i, j, y, x; + int i, y, x; + IDX j; ugbldg_type *cur_ugbldg; for (i = 0; i < n; i++) diff --git a/src/scores.c b/src/scores.c index c808f6398..dafb11e57 100644 --- a/src/scores.c +++ b/src/scores.c @@ -624,8 +624,8 @@ errr predict_score(void) /* Save the level and such */ sprintf(the_score.cur_lev, "%3d", (int)p_ptr->lev); sprintf(the_score.cur_dun, "%3d", (int)dun_level); - sprintf(the_score.max_lev, "%3d", p_ptr->max_plv); - sprintf(the_score.max_dun, "%3d", max_dlv[dungeon_type]); + sprintf(the_score.max_lev, "%3d", (int)p_ptr->max_plv); + sprintf(the_score.max_dun, "%3d", (int)max_dlv[dungeon_type]); /* Hack -- no cause of death */ /* まだ死んでいないときの識別文字 */ -- 2.11.0