[Refactor] #39077 IDX型を各々正しい型へ置換．

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 19af7e6..4f1926f 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -479,7 +479,7 @@ void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
                        }
 
                        /* Free the "who" array */
-                       C_KILL(who, current_floor_ptr->max_m_idx, IDX);
+                       C_KILL(who, current_floor_ptr->max_m_idx, MONSTER_IDX);
                }
                o_ptr->timeout = 100 + randint1(100);
                return;

diff --git a/src/core.c b/src/core.c
index 7d27cb7..abd4441 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5612,7 +5612,7 @@ void play_game(bool new_game)
        if (new_game && ((p_ptr->pclass == CLASS_CAVALRY) || (p_ptr->pclass == CLASS_BEASTMASTER)))
        {
                monster_type *m_ptr;
-               IDX pet_r_idx = ((p_ptr->pclass == CLASS_CAVALRY) ? MON_HORSE : MON_YASE_HORSE);
+               MONRACE_IDX pet_r_idx = ((p_ptr->pclass == CLASS_CAVALRY) ? MON_HORSE : MON_YASE_HORSE);
                monster_race *r_ptr = &r_info[pet_r_idx];
                place_monster_aux(0, p_ptr->y, p_ptr->x - 1, pet_r_idx,
                                  (PM_FORCE_PET | PM_NO_KAGE));

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 2b8c2d1..cecbeb4 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -2983,7 +2983,7 @@ errr parse_r_info(char *buf, header *head)
                r_ptr->extra = (BIT_FLAGS16)pad;
                r_ptr->mexp = (EXP)exp;
                r_ptr->next_exp = (EXP)nextexp;
-               r_ptr->next_r_idx = (IDX)nextmon;
+               r_ptr->next_r_idx = (MONRACE_IDX)nextmon;
        }
 
        /* Process 'R' for "Reinforcement" (up to six lines) */
@@ -3610,7 +3610,7 @@ static errr parse_line_feature(char *buf)
                        if (zz[6][0] == '*')
                        {
                                letter[index].random |= RANDOM_ARTIFACT;
-                               if (zz[6][1]) letter[index].artifact = (IDX)atoi(zz[6] + 1);
+                               if (zz[6][1]) letter[index].artifact = (ARTIFACT_IDX)atoi(zz[6] + 1);
                        }
                        else if (zz[6][0] == '!')
                        {
@@ -3621,7 +3621,7 @@ static errr parse_line_feature(char *buf)
                        }
                        else
                        {
-                               letter[index].artifact = (IDX)atoi(zz[6]);
+                               letter[index].artifact = (ARTIFACT_IDX)atoi(zz[6]);
                        }
                        /* Fall through */
                /* Ego-item */
@@ -3629,11 +3629,11 @@ static errr parse_line_feature(char *buf)
                        if (zz[5][0] == '*')
                        {
                                letter[index].random |= RANDOM_EGO;
-                               if (zz[5][1]) letter[index].ego = (IDX)atoi(zz[5] + 1);
+                               if (zz[5][1]) letter[index].ego = (EGO_IDX)atoi(zz[5] + 1);
                        }
                        else
                        {
-                               letter[index].ego = (IDX)atoi(zz[5]);
+                               letter[index].ego = (EGO_IDX)atoi(zz[5]);
                        }
                        /* Fall through */
                /* Object */
@@ -3641,7 +3641,7 @@ static errr parse_line_feature(char *buf)
                        if (zz[4][0] == '*')
                        {
                                letter[index].random |= RANDOM_OBJECT;
-                               if (zz[4][1]) letter[index].object = (IDX)atoi(zz[4] + 1);
+                               if (zz[4][1]) letter[index].object = (OBJECT_IDX)atoi(zz[4] + 1);
                        }
                        else if (zz[4][0] == '!')
                        {
@@ -4290,55 +4290,55 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        /* Maximum r_idx */
                        else if (zz[0][0] == 'R')
                        {
-                               max_r_idx = (IDX)atoi(zz[1]);
+                               max_r_idx = (RACE_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum k_idx */
                        else if (zz[0][0] == 'K')
                        {
-                               max_k_idx = (IDX)atoi(zz[1]);
+                               max_k_idx = (KIND_OBJECT_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum v_idx */
                        else if (zz[0][0] == 'V')
                        {
-                               max_v_idx = (IDX)atoi(zz[1]);
+                               max_v_idx = (VAULT_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum f_idx */
                        else if (zz[0][0] == 'F')
                        {
-                               max_f_idx = (IDX)atoi(zz[1]);
+                               max_f_idx = (FEAT_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum a_idx */
                        else if (zz[0][0] == 'A')
                        {
-                               max_a_idx = (IDX)atoi(zz[1]);
+                               max_a_idx = (ARTIFACT_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum e_idx */
                        else if (zz[0][0] == 'E')
                        {
-                               max_e_idx = (IDX)atoi(zz[1]);
+                               max_e_idx = (EGO_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum d_idx */
                        else if (zz[0][0] == 'D')
                        {
-                               max_d_idx = (IDX)atoi(zz[1]);
+                               max_d_idx = (DUNGEON_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum o_idx */
                        else if (zz[0][0] == 'O')
                        {
-                               current_floor_ptr->max_o_idx = (IDX)atoi(zz[1]);
+                               current_floor_ptr->max_o_idx = (OBJECT_IDX)atoi(zz[1]);
                        }
 
                        /* Maximum m_idx */
                        else if (zz[0][0] == 'M')
                        {
-                               current_floor_ptr->max_m_idx = (IDX)atoi(zz[1]);
+                               current_floor_ptr->max_m_idx = (MONSTER_IDX)atoi(zz[1]);
                        }
 
                        /* Wilderness size */
@@ -4346,10 +4346,10 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        {
                                /* Maximum wild_x_size */
                                if (zz[0][1] == 'X')
-                                       current_world_ptr->max_wild_x = atoi(zz[1]);
+                                       current_world_ptr->max_wild_x = (POSITION)atoi(zz[1]);
                                /* Maximum wild_y_size */
                                if (zz[0][1] == 'Y')
-                                       current_world_ptr->max_wild_y = atoi(zz[1]);
+                                       current_world_ptr->max_wild_y = (POSITION)atoi(zz[1]);
                        }
 
                        return (0);

diff --git a/src/floor-events.c b/src/floor-events.c
index 86ff69d..1be04fb 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -145,7 +145,7 @@ byte get_dungeon_feeling(void)
 {
        const int base = 10;
        int rating = 0;
-       IDX i;
+       MONSTER_IDX i;
 
        /* Hack -- no feeling in the town */
        if (!current_floor_ptr->dun_level) return 0;

diff --git a/src/monster.h b/src/monster.h
index 803c2c9..adb32d5 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -511,8 +511,8 @@ extern void monster_drop_carried_objects(monster_type *m_ptr);
 #define is_friendly(A) \
         (bool)(((A)->smart & SM_FRIENDLY) ? TRUE : FALSE)
 
-#define is_friendly_idx(IDX) \
-        (bool)((IDX) > 0 && is_friendly(&current_floor_ptr->m_list[(IDX)]))
+#define is_friendly_idx(MONSTER_IDX) \
+        (bool)((MONSTER_IDX) > 0 && is_friendly(&current_floor_ptr->m_list[(MONSTER_IDX)]))
 
 #define is_pet(A) \
         (bool)(((A)->smart & SM_PET) ? TRUE : FALSE)

diff --git a/src/rumor.c b/src/rumor.c
index ce54604..db1a91a 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -65,7 +65,8 @@ void display_rumor(bool ex)
                {
                        if (strcmp(zz[0], "ARTIFACT") == 0)
                        {
-                               IDX a_idx, k_idx;
+                               ARTIFACT_IDX a_idx;
+                               KIND_OBJECT_IDX k_idx;
                                object_type forge;
                                object_type *q_ptr = &forge;
                                artifact_type *a_ptr;

diff --git a/src/wizard2.c b/src/wizard2.c
index 4071bb5..515df08 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1527,7 +1527,7 @@ static void do_cmd_wiz_create_feature(void)
        grid_type    *g_ptr;
        feature_type *f_ptr;
        char         tmp_val[160];
-       IDX          tmp_feat, tmp_mimic;
+       FEAT_IDX          tmp_feat, tmp_mimic;
        POSITION y, x;
 
        if (!tgt_pt(&x, &y)) return;
@@ -1541,7 +1541,7 @@ static void do_cmd_wiz_create_feature(void)
        if (!get_string(_("地形: ", "Feature: "), tmp_val, 3)) return;
 
        /* Extract */
-       tmp_feat = (IDX)atoi(tmp_val);
+       tmp_feat = (FEAT_IDX)atoi(tmp_val);
        if (tmp_feat < 0) tmp_feat = 0;
        else if (tmp_feat >= max_f_idx) tmp_feat = max_f_idx - 1;
 
@@ -1552,7 +1552,7 @@ static void do_cmd_wiz_create_feature(void)
        if (!get_string(_("地形 (mimic): ", "Feature (mimic): "), tmp_val, 3)) return;
 
        /* Extract */
-       tmp_mimic = (IDX)atoi(tmp_val);
+       tmp_mimic = (FEAT_IDX)atoi(tmp_val);
        if (tmp_mimic < 0) tmp_mimic = 0;
        else if (tmp_mimic >= max_f_idx) tmp_mimic = max_f_idx - 1;