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

diff --git a/src/cmd4.c b/src/cmd4.c
index fef76e2..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;
 

diff --git a/src/effects.c b/src/effects.c
index eb485b3..5d41b9e 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -4520,7 +4520,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
                }
                else
                {
-                       int q_idx = quest_number(dun_level);
+                       QUEST_IDX q_idx = quest_number(dun_level);
                        bool seppuku = streq(hit_from, "Seppuku");
                        bool winning_seppuku = p_ptr->total_winner && seppuku;
 

diff --git a/src/flavor.c b/src/flavor.c
index e829ea5..22c02d6 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1249,7 +1249,7 @@ bool object_is_quest_target(object_type *o_ptr)
 {
        if (p_ptr->inside_quest)
        {
-               int a_idx = quest[p_ptr->inside_quest].k_idx;
+               ARTIFACT_IDX a_idx = quest[p_ptr->inside_quest].k_idx;
                if (a_idx)
                {
                        artifact_type *a_ptr = &a_info[a_idx];

diff --git a/src/floor-generate.c b/src/floor-generate.c
index c98c180..9f2ba73 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -184,7 +184,7 @@ static bool alloc_stairs(IDX feat, int num, int walls)
        }
        else if (have_flag(f_ptr->flags, FF_MORE))
        {
-               int q_idx = quest_number(dun_level);
+               QUEST_IDX q_idx = quest_number(dun_level);
 
                /* No downstairs on quest levels */
                if (dun_level > 1 && q_idx)

diff --git a/src/init1.c b/src/init1.c
index f91ae1f..793193d 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3730,7 +3730,7 @@ static errr parse_line_feature(char *buf)
                                {
                                        if (p_ptr->inside_quest)
                                        {
-                                               int a_idx = quest[p_ptr->inside_quest].k_idx;
+                                               ARTIFACT_IDX a_idx = quest[p_ptr->inside_quest].k_idx;
                                                if (a_idx)
                                                {
                                                        artifact_type *a_ptr = &a_info[a_idx];

diff --git a/src/object2.c b/src/object2.c
index 332bcf3..c9d9c60 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -656,7 +656,7 @@ static errr get_obj_num_prep(void)
 OBJECT_IDX get_obj_num(DEPTH level)
 {
        int i, j, p;
-       int k_idx;
+       KIND_OBJECT_IDX k_idx;
        long value, total;
        object_kind     *k_ptr;
        alloc_entry     *table = alloc_kind_table;

diff --git a/src/xtra2.c b/src/xtra2.c
index a476df8..f62015f 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5700,9 +5700,9 @@ void display_rumor(bool ex)
                                        r_ptr->r_sights++;
                                }
                        }
-                       else if  (strcmp(zz[0], "DUNGEON") == 0)
+                       else if (strcmp(zz[0], "DUNGEON") == 0)
                        {
-                               int d_idx;
+                               DUNGEON_IDX d_idx;
                                dungeon_info_type *d_ptr;
 
                                while (1)