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

diff --git a/src/autopick.c b/src/autopick.c
index 44726e9..71ddabf 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1703,7 +1703,7 @@ void autopick_alter_item(INVENTORY_IDX item, bool destroy)
  */
 void autopick_pickup_items(cave_type *c_ptr)
 {
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        
        /* Scan the pile of objects */
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)

diff --git a/src/cmd1.c b/src/cmd1.c
index 4c32d90..351df55 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -557,7 +557,7 @@ void carry(bool pickup)
 {
        cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
 
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        char    o_name[MAX_NLEN];
 
@@ -1840,7 +1840,7 @@ static bool run_test(void)
        /* Look at every newly adjacent square. */
        for (i = -max; i <= max; i++)
        {
-               s16b this_o_idx, next_o_idx = 0;
+               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                /* New direction */
                new_dir = cycle[chome[prev_dir] + i];

diff --git a/src/cmd4.c b/src/cmd4.c
index 8b500d3..2982869 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5441,7 +5441,7 @@ static void do_cmd_knowledge_artifacts(void)
                {
                        cave_type *c_ptr = &cave[y][x];
 
-                       s16b this_o_idx, next_o_idx = 0;
+                       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                        /* Scan all objects in the grid */
                        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 7db9eca..5aeb1bc 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -290,7 +290,7 @@ void build_streamer(IDX feat, int chance)
 
                        if (c_ptr->o_idx && !have_flag(streamer_ptr->flags, FF_DROP))
                        {
-                               s16b this_o_idx, next_o_idx = 0;
+                               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                                /* Scan all objects in the grid */
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)

diff --git a/src/monster-process.c b/src/monster-process.c
index c7ee8b2..1ceb5a3 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3130,7 +3130,7 @@ void process_monster(MONSTER_IDX m_idx)
                        if (c_ptr->o_idx && (r_ptr->flags2 & (RF2_TAKE_ITEM | RF2_KILL_ITEM)) &&
                            (!is_pet(m_ptr) || ((p_ptr->pet_extra_flags & PF_PICKUP_ITEMS) && (r_ptr->flags2 & RF2_TAKE_ITEM))))
                        {
-                               s16b this_o_idx, next_o_idx;
+                               OBJECT_IDX this_o_idx, next_o_idx;
                                bool do_take = (r_ptr->flags2 & RF2_TAKE_ITEM) ? TRUE : FALSE;
 
                                /* Scan all objects in the grid */

diff --git a/src/monster2.c b/src/monster2.c
index e93d40e..1672953 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -334,7 +334,7 @@ static void compact_monsters_aux(IDX i1, IDX i2)
        int i;
        cave_type *c_ptr;
        monster_type *m_ptr;
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        /* Do nothing */
        if (i1 == i2) return;
@@ -4582,7 +4582,7 @@ bool player_place(POSITION y, POSITION x)
  */
 void monster_drop_carried_objects(monster_type *m_ptr)
 {
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        object_type forge;
        object_type *o_ptr;
        object_type *q_ptr;

diff --git a/src/object2.c b/src/object2.c
index c9d9c60..605d3bf 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -62,7 +62,7 @@ void excise_object_idx(OBJECT_IDX o_idx)
 {
        object_type *j_ptr;
 
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        s16b prev_o_idx = 0;
 

diff --git a/src/spells2.c b/src/spells2.c
index 2e164cc..678c5fb 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1632,7 +1632,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                        /* During generation, destroyed artifacts are "preserved" */
                        if (preserve_mode || in_generate)
                        {
-                               s16b this_o_idx, next_o_idx = 0;
+                               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                                /* Scan all objects in the grid */
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)

diff --git a/src/spells3.c b/src/spells3.c
index 1914556..a217cb8 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -5070,7 +5070,7 @@ bool polymorph_monster(POSITION y, POSITION x)
        {
                BIT_FLAGS mode = 0L;
                bool preserve_hold_objects = back_m.hold_o_idx ? TRUE : FALSE;
-               s16b this_o_idx, next_o_idx = 0;
+               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                /* Get the monsters attitude */
                if (is_friendly(m_ptr)) mode |= PM_FORCE_FRIENDLY;

diff --git a/src/xtra1.c b/src/xtra1.c
index 0034f4b..5b0f2d2 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3223,7 +3223,7 @@ void calc_bonuses(void)
        bool            have_sw = FALSE, have_kabe = FALSE;
        bool            easy_2weapon = FALSE;
        bool            riding_levitation = FALSE;
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        const player_race *tmp_rp_ptr;
 
        /* Save the old vision stuff */

diff --git a/src/xtra2.c b/src/xtra2.c
index f62015f..8211f5f 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2987,7 +2987,7 @@ bool show_gold_on_floor = FALSE;
 static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 {
        cave_type *c_ptr = &cave[y][x];
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        cptr s1 = "", s2 = "", s3 = "", x_info = "";
        bool boring = TRUE;
        FEAT_IDX feat;