OSDN Git Service

#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.
[hengband/hengband.git] / src / cmd4.c
index 661b1c6..3ed8cb0 100644 (file)
@@ -517,7 +517,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                        fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n",
                                                   " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note,
                                                   _(d_name + d_info[num].name, (int)max_dlv[num]),
-                                                  _(max_dlv[num], d_name + d_info[num].name));
+                                                  _((int)max_dlv[num], d_name + d_info[num].name));
                        break;
                }
                case NIKKI_STAIR:
@@ -541,7 +541,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                        if (!num)
                        fprintf(fff, _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n"), 
                                                hour, min, note_level, _(d_name+d_info[dungeon_type].name, (int)max_dlv[dungeon_type]), 
-                                                                                          _(max_dlv[dungeon_type], d_name+d_info[dungeon_type].name));
+                                                                                          _((int)max_dlv[dungeon_type], d_name+d_info[dungeon_type].name));
                        else
                                fprintf(fff, _(" %2d:%02d %20s 帰還を使って地上へと戻った。\n", " %2d:%02d %20s recalled from dungeon to surface.\n"), hour, min, note_level);
                        break;
@@ -3142,9 +3142,9 @@ static void print_visuals_menu(cptr choice_msg)
        prt(format("コマンド: %s", choice_msg ? choice_msg : _("", "")), 15, 0);
 }
 
-static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, int direct_r_idx);
-static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, int direct_k_idx);
-static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int direct_f_idx, int *lighting_level);
+static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX direct_r_idx);
+static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX direct_k_idx);
+static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f_idx, int *lighting_level);
 
 /*
  * Interact with "visuals"
@@ -3384,7 +3384,7 @@ void do_cmd_visuals(void)
                case '4':
                {
                        static cptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars");
-                       static int r = 0;
+                       static IDX r = 0;
 
                        prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
 
@@ -4314,7 +4314,7 @@ static bool ang_sort_comp_monster_level(vptr u, vptr v, int a, int b)
  * mode & 0x01 : check for non-empty group
  * mode & 0x02 : visual operation only
  */
-static int collect_monsters(int grp_cur, s16b mon_idx[], byte mode)
+static int collect_monsters(int grp_cur, s16b mon_idx[], BIT_FLAGS8 mode)
 {
        int i, mon_cnt = 0;
        int dummy_why;
@@ -4560,9 +4560,10 @@ static byte object_group_tval[] =
  * mode & 0x01 : check for non-empty group
  * mode & 0x02 : visual operation only
  */
-static int collect_objects(int grp_cur, int object_idx[], byte mode)
+static int collect_objects(int grp_cur, IDX object_idx[], BIT_FLAGS8 mode)
 {
-       int i, j, k, object_cnt = 0;
+       IDX i;
+       int j, k, object_cnt = 0;
 
        /* Get a list of x_char in this group */
        byte group_tval = object_group_tval[grp_cur];
@@ -4642,9 +4643,10 @@ static cptr feature_group_text[] =
  *
  * mode & 0x01 : check for non-empty group
  */
-static int collect_features(int grp_cur, int *feat_idx, byte mode)
+static int collect_features(int grp_cur, IDX *feat_idx, BIT_FLAGS8 mode)
 {
-       int i, feat_cnt = 0;
+       IDX i;
+       int feat_cnt = 0;
 
        /* Unused;  There is a single group. */
        (void)grp_cur;
@@ -5447,7 +5449,8 @@ static void ang_sort_art_swap(vptr u, vptr v, int a, int b)
  */
 static void do_cmd_knowledge_artifacts(void)
 {
-       int i, k, z, x, y, n = 0;
+       int i, k, x, y, n = 0;
+       IDX z;
        u16b why = 3;
        s16b *who;
 
@@ -6299,7 +6302,7 @@ static void do_cmd_knowledge_kill_count(void)
  * @return なし
  */
 static void display_group_list(int col, int row, int wid, int per_page,
-       int grp_idx[], cptr group_text[], int grp_cur, int grp_top)
+       IDX grp_idx[], cptr group_text[], int grp_cur, int grp_top)
 {
        int i;
 
@@ -6324,13 +6327,13 @@ 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, int *grp_cur, int grp_cnt, 
-                                                  int *list_cur, int 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;
-       int grp = *grp_cur;
-       int list = *list_cur;
+       IDX grp = *grp_cur;
+       IDX list = *list_cur;
 
        /* Extract direction */
        if (ch == ' ')
@@ -6710,14 +6713,15 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
 /*
  * Display known monsters.
  */
-static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, int direct_r_idx)
+static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX direct_r_idx)
 {
-       int i, len, max;
-       int grp_cur, grp_top, old_grp_cur;
-       int mon_cur, mon_top;
-       int grp_cnt, grp_idx[100];
-       int mon_cnt;
-       s16b *mon_idx;
+       IDX i;
+       int len, max;
+       IDX grp_cur, grp_top, old_grp_cur;
+       IDX mon_cur, mon_top;
+       IDX grp_cnt, grp_idx[100];
+       IDX mon_cnt;
+       IDX *mon_idx;
 
        int column = 0;
        bool flag;
@@ -6727,9 +6731,9 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, int d
        byte attr_top = 0, char_left = 0;
 
        int browser_rows;
-       int wid, hgt;
+       POSITION wid, hgt;
 
-       byte mode;
+       BIT_FLAGS8 mode;
 
        /* Get size */
        Term_get_size(&wid, &hgt);
@@ -6970,7 +6974,7 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, int d
 /*
  * Display the objects in a group.
  */
-static void display_object_list(int col, int row, int per_page, int object_idx[],
+static void display_object_list(int col, int row, int per_page, IDX object_idx[],
        int object_cur, int object_top, bool visual_only)
 {
        int i;
@@ -7087,14 +7091,16 @@ static void desc_obj_fake(IDX k_idx)
 /*
  * Display known objects
  */
-static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, int direct_k_idx)
+static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX direct_k_idx)
 {
-       int i, len, max;
-       int grp_cur, grp_top, old_grp_cur;
-       int object_old, object_cur, object_top;
-       int grp_cnt, grp_idx[100];
+       IDX i;
+       int len, max;
+       IDX grp_cur, grp_top, old_grp_cur;
+       IDX object_old, object_cur, object_top;
+       int grp_cnt;
+       IDX grp_idx[100];
        int object_cnt;
-       int *object_idx;
+       IDX *object_idx;
 
        int column = 0;
        bool flag;
@@ -7114,7 +7120,7 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, int di
        browser_rows = hgt - 8;
 
        /* Allocate the "object_idx" array */
-       C_MAKE(object_idx, max_k_idx, int);
+       C_MAKE(object_idx, max_k_idx, IDX);
 
        max = 0;
        grp_cnt = 0;
@@ -7368,7 +7374,7 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, int di
        }
 
        /* Free the "object_idx" array */
-       C_KILL(object_idx, max_k_idx, int);
+       C_KILL(object_idx, max_k_idx, IDX);
 }
 
 
@@ -7448,12 +7454,14 @@ 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;
-       int feat_cur, feat_top;
-       int grp_cnt, grp_idx[100];
+       IDX i;
+       int len, max;
+       IDX grp_cur, grp_top, old_grp_cur;
+       IDX feat_cur, feat_top;
+       int grp_cnt;
+       IDX grp_idx[100];
        int feat_cnt;
-       int *feat_idx;
+       IDX *feat_idx;
 
        int column = 0;
        bool flag;
@@ -8091,13 +8099,8 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
                                }
 
                                /* Print the quest info */
-#ifdef JP
-                               sprintf(tmp_str, "  %s (危険度:%d階相当)%s\n",
-                                       quest[i].name, quest[i].level, note);
-#else
-                               sprintf(tmp_str, "  %s (Danger level: %d)%s\n",
-                                       quest[i].name, quest[i].level, note);
-#endif
+                               sprintf(tmp_str, _("  %s (危険度:%d階相当)%s\n", "  %s (Danger level: %d)%s\n"),
+                                       quest[i].name, (int)quest[i].level, note);
 
                                fputs(tmp_str, fff);
 
@@ -8132,13 +8135,13 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
                                        {
 #ifdef JP
                                                sprintf(rand_tmp_str,"  %s (%d 階) - %d 体の%sを倒す。(あと %d 体)\n",
-                                                       quest[i].name, quest[i].level,
+                                                       quest[i].name, (int)quest[i].level,
                                                        quest[i].max_num, name, quest[i].max_num - quest[i].cur_num);
 #else
                                                plural_aux(name);
 
                                                sprintf(rand_tmp_str,"  %s (Dungeon level: %d)\n  Kill %d %s, have killed %d.\n",
-                                                       quest[i].name, quest[i].level,
+                                                       quest[i].name, (idx)quest[i].level,
                                                        quest[i].max_num, name, quest[i].cur_num);
 #endif
                                        }
@@ -8201,7 +8204,7 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx)
                                _("  %-35s (%3d階)            -   不戦勝 - %s\n",
                                  "  %-35s (Dungeon level: %3d) - Unearned - %s\n") ,
                                r_name+r_info[q_ptr->r_idx].name,
-                               q_ptr->level, playtime_str);
+                               (int)q_ptr->level, playtime_str);
                }
                else
                {
@@ -8209,7 +8212,7 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx)
                                _("  %-35s (%3d階)            - レベル%2d - %s\n",
                                  "  %-35s (Dungeon level: %3d) - level %2d - %s\n") ,
                                r_name+r_info[q_ptr->r_idx].name,
-                               q_ptr->level,
+                               (int)q_ptr->level,
                                q_ptr->complev,
                                playtime_str);
                }
@@ -8220,7 +8223,7 @@ static bool do_cmd_knowledge_quests_aux(FILE *fff, IDX q_idx)
                sprintf(tmp_str,
                        _("  %-35s (危険度:%3d階相当) - レベル%2d - %s\n",
                          "  %-35s (Danger  level: %3d) - level %2d - %s\n") ,
-                       q_ptr->name, q_ptr->level, q_ptr->complev, playtime_str);
+                       q_ptr->name, (int)q_ptr->level, q_ptr->complev, playtime_str);
        }
 
        fputs(tmp_str, fff);
@@ -8231,7 +8234,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;
@@ -8239,7 +8242,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 &&
@@ -8255,7 +8258,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;
@@ -8343,7 +8346,8 @@ static void do_cmd_knowledge_quests(void)
 {
        FILE *fff;
        char file_name[1024];
-       int *quest_num, dummy, i;
+       IDX *quest_num;
+       int dummy, i;
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);