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

diff --git a/src/bldg.c b/src/bldg.c
index d354e76..1e4b03f 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3120,7 +3120,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        object_type *o_ptr, *mo_ptr; /* broken weapon and material weapon */
        object_kind *k_ptr;
        int i, dd_bonus, ds_bonus;
-       IDX k_idx;
+       KIND_OBJECT_IDX k_idx;
        char basenm[MAX_NLEN];
        cptr q, s; /* For get_item prompt */
        int row = 7;

diff --git a/src/cave.c b/src/cave.c
index 64414fb..11ae836 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -5001,7 +5001,7 @@ void monster_race_track(MONRACE_IDX r_idx)
 /*
  * Hack -- track the given object kind
  */
-void object_kind_track(IDX k_idx)
+void object_kind_track(KIND_OBJECT_IDX k_idx)
 {
        /* Save this monster ID */
        p_ptr->object_kind_idx = k_idx;

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index c96d35f..8106082 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -213,10 +213,10 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                        byte y, x = 0;
                        OBJECT_SUBTYPE_VALUE ctr;
                        PERCENTAGE chance;
-                       IDX k_idx;
+                       KIND_OBJECT_IDX k_idx;
                        char dummy[80];
                        POSITION x1, y1;
-                       int level;
+                       DEPTH level;
                        byte col;
 
                        strcpy(dummy, "");
@@ -517,7 +517,7 @@ bool do_cmd_magic_eater(bool only_browse, bool powerful)
        OBJECT_SUBTYPE_VALUE item;
        PERCENTAGE chance;
        DEPTH level;
-       IDX k_idx;
+       KIND_OBJECT_IDX k_idx;
        OBJECT_TYPE_VALUE tval;
        OBJECT_SUBTYPE_VALUE sval;
        bool use_charge = TRUE;

diff --git a/src/cmd4.c b/src/cmd4.c
index 11aa016..9c771a5 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -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);
@@ -6999,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;
@@ -8018,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;

diff --git a/src/externs.h b/src/externs.h
index e35cb2e..3d6eaf8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -516,7 +516,7 @@ extern bool projectable(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, BIT_FLAGS mode);
 extern void health_track(MONSTER_IDX m_idx);
 extern void monster_race_track(MONRACE_IDX r_idx);
-extern void object_kind_track(IDX k_idx);
+extern void object_kind_track(KIND_OBJECT_IDX k_idx);
 extern void disturb(int stop_search, int flush_output);
 extern void glow_deep_lava_and_bldg(void);
 extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITION x, BIT_FLAGS mode);
@@ -851,7 +851,7 @@ extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt);
 extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt);
 extern void combine_pack(void);
 extern void reorder_pack(void);
-extern void display_koff(IDX k_idx);
+extern void display_koff(KIND_OBJECT_IDX k_idx);
 extern object_type *choose_warning_item(void);
 extern bool process_warning(int xx, int yy);
 extern void do_cmd_kaji(bool only_browse);

diff --git a/src/files.c b/src/files.c
index 20f7423..3376077 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -4366,7 +4366,7 @@ static void dump_aux_class_special(FILE *fff)
                char s[EATER_EXT][MAX_NLEN];
                OBJECT_TYPE_VALUE tval;
                int ext;
-               IDX k_idx;
+               KIND_OBJECT_IDX k_idx;
                OBJECT_SUBTYPE_VALUE i;
                int magic_num;
 

diff --git a/src/init1.c b/src/init1.c
index df01163..f91ae1f 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -4184,7 +4184,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        {
                                if (a_info[artifact_index].cur_num)
                                {
-                                       IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
+                                       KIND_OBJECT_IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
                                        object_type forge;
                                        object_type *q_ptr = &forge;
 

diff --git a/src/object2.c b/src/object2.c
index d7746df..332bcf3 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -2190,7 +2190,7 @@ static void object_mention(object_type *o_ptr)
 static bool make_artifact_special(object_type *o_ptr)
 {
        IDX i;
-       IDX k_idx = 0;
+       KIND_OBJECT_IDX k_idx = 0;
 
        /*! @note 地上ではキャンセルする / No artifacts in the town */
        if (!dun_level) return (FALSE);
@@ -4856,7 +4856,7 @@ bool make_object(object_type *j_ptr, BIT_FLAGS mode)
        /* Generate a special object, or a normal object */
        if (!one_in_(prob) || !make_artifact_special(j_ptr))
        {
-               IDX k_idx;
+               KIND_OBJECT_IDX k_idx;
 
                /* Good objects */
                if ((mode & AM_GOOD) && !get_obj_num_hook)
@@ -5578,7 +5578,8 @@ void amusement(POSITION y1, POSITION x1, int num, bool known)
        while (num)
        {
                int i;
-               IDX k_idx, a_idx = 0;
+               KIND_OBJECT_IDX k_idx;
+               ARTIFACT_IDX a_idx = 0;
                int r = randint0(t);
                bool insta_art, fixed_art;
 
@@ -6573,7 +6574,7 @@ void reorder_pack(void)
  * @details
  * Include list of usable spells for readible books
  */
-void display_koff(IDX k_idx)
+void display_koff(KIND_OBJECT_IDX k_idx)
 {
        int y;
 

diff --git a/src/xtra2.c b/src/xtra2.c
index a42edd7..a476df8 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1273,7 +1273,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                if ((r_ptr->flags7 & RF7_GUARDIAN) && (d_info[dungeon_type].final_guardian == m_ptr->r_idx))
                {
-                       IDX k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
+                       KIND_OBJECT_IDX k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
                                : lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
 
                        if (d_info[dungeon_type].final_artifact)