[Refactor] #37287 #37353 型の置換。 / Type replacement.

[hengband/hengband.git] / src / cmd4.c

diff --git a/src/cmd4.c b/src/cmd4.c
index b038f3a..8b500d3 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -369,7 +369,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
        cptr note_level = "";
        bool do_level = TRUE;
        char note_level_buf[40];
-       int q_idx;
+       QUEST_IDX q_idx;
 
        static bool disable_nikki = FALSE;
 
@@ -3194,7 +3194,7 @@ void do_cmd_visuals(void)
                case '2':
                {
                        static cptr mark = "Object attr/chars";
-                       IDX k_idx;
+                       KIND_OBJECT_IDX k_idx;
 
                        /* Prompt */
                        prt(_("コマンド: アイテムの[色/文字]をファイルに書き出します", "Command: Dump object attr/chars"), 15, 0);
@@ -4668,7 +4668,7 @@ void do_cmd_load_screen(void)
 {
        int i, y, x;
 
-       byte a = 0;
+       TERM_COLOR a = 0;
        char c = ' ';
 
        bool okay = TRUE;
@@ -4798,10 +4798,10 @@ cptr inven_res_label = _("                               酸電火冷毒光闇
 
 
 /* XTRA HACK RESLIST */
-static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, byte tval, char *where)
+static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, OBJECT_TYPE_VALUE tval, char *where)
 {
        char o_name[MAX_NLEN];
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        if (!o_ptr->k_idx) return;
        if (o_ptr->tval != tval) return;
@@ -4902,7 +4902,7 @@ static void do_cmd_knowledge_inven(void)
 
        store_type  *st_ptr;
 
-       byte tval;
+       OBJECT_TYPE_VALUE tval;
        int i = 0;
        int j = 0;
 
@@ -4960,7 +4960,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 {
        int y, x, i;
 
-       byte a = 0, old_a = 0;
+       TERM_COLOR a = 0, old_a = 0;
        char c = ' ';
 
        FILE *fff, *tmpfff;
@@ -5195,7 +5195,7 @@ void do_cmd_save_screen(void)
        {
                int y, x;
 
-               byte a = 0;
+               TERM_COLOR a = 0;
                char c = ' ';
 
                FILE *fff;
@@ -6382,7 +6382,7 @@ static void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt,
 /*
  * Display visuals.
  */
-static void display_visual_list(int col, int row, int height, int width, byte attr_top, byte char_left)
+static void display_visual_list(int col, int row, int height, int width, TERM_COLOR attr_top, byte char_left)
 {
        int i, j;
 
@@ -6434,7 +6434,7 @@ static void display_visual_list(int col, int row, int height, int width, byte at
 /*
  * Place the cursor at the collect position for visual mode
  */
-static void place_visual_list_cursor(TERM_LEN col, TERM_LEN row, TERM_COLOR a, byte c, byte attr_top, byte char_left)
+static void place_visual_list_cursor(TERM_LEN col, TERM_LEN row, TERM_COLOR a, byte c, TERM_COLOR attr_top, byte char_left)
 {
        int i = (a & 0x7f) - attr_top;
        int j = c - char_left;
@@ -6465,7 +6465,7 @@ static byte char_idx_feat[F_LIT_MAX];
  */
 static bool visual_mode_command(char ch, bool *visual_list_ptr,
                                int height, int width,
-                               byte *attr_top_ptr, byte *char_left_ptr,
+                               TERM_COLOR *attr_top_ptr, byte *char_left_ptr,
                                TERM_COLOR *cur_attr_ptr, byte *cur_char_ptr, bool *need_redraw)
 {
        static TERM_COLOR attr_old = 0;
@@ -6672,7 +6672,8 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
        bool redraw;
 
        bool visual_list = FALSE;
-       byte attr_top = 0, char_left = 0;
+       TERM_COLOR attr_top = 0;
+       byte char_left = 0;
 
        int browser_rows;
        TERM_LEN wid, hgt;
@@ -6998,7 +6999,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 /*
  * Describe fake object
  */
-static void desc_obj_fake(IDX k_idx)
+static void desc_obj_fake(KIND_OBJECT_IDX k_idx)
 {
        object_type *o_ptr;
        object_type object_type_body;
@@ -7052,7 +7053,8 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
        bool redraw;
 
        bool visual_list = FALSE;
-       byte attr_top = 0, char_left = 0;
+       TERM_COLOR attr_top = 0;
+       byte char_left = 0;
 
        int browser_rows;
        int wid, hgt;
@@ -7421,7 +7423,8 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
        TERM_COLOR attr_old[F_LIT_MAX];
        byte char_old[F_LIT_MAX];
-       byte *cur_attr_ptr, *cur_char_ptr;
+       TERM_COLOR *cur_attr_ptr;
+       byte *cur_char_ptr;
 
        (void)C_WIPE(attr_old, F_LIT_MAX, byte);
        (void)C_WIPE(char_old, F_LIT_MAX, byte);
@@ -7642,7 +7645,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
 
                else if ((ch == 'D') || (ch == 'd'))
                {
-                       byte prev_x_attr = f_ptr->x_attr[*lighting_level];
+                       TERM_COLOR prev_x_attr = f_ptr->x_attr[*lighting_level];
                        byte prev_x_char = f_ptr->x_char[*lighting_level];
 
                        apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char);
@@ -8015,7 +8018,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
                                                        artifact_type *a_ptr = &a_info[quest[i].k_idx];
                                                        object_type forge;
                                                        object_type *q_ptr = &forge;
-                                                       IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
+                                                       KIND_OBJECT_IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
                                                        object_prep(q_ptr, k_idx);
                                                        q_ptr->name1 = quest[i].k_idx;
                                                        q_ptr->ident = IDENT_STORE;