[Refactor] #37353 メッセージ整理と型の置換 / Refactor messages and type replacement.

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

diff --git a/src/object2.c b/src/object2.c
index 40f1d2d..b29d176 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -64,9 +64,7 @@ void excise_object_idx(OBJECT_IDX o_idx)
        object_type *j_ptr;
 
        OBJECT_IDX this_o_idx, next_o_idx = 0;
-
-       s16b prev_o_idx = 0;
-
+       OBJECT_IDX prev_o_idx = 0;
 
        /* Object */
        j_ptr = &o_list[o_idx];
@@ -83,8 +81,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
                for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -137,8 +133,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -206,8 +200,6 @@ void delete_object_idx(OBJECT_IDX o_idx)
                /* Visual update */
                lite_spot(y, x);
        }
-
-       /* Wipe the object */
        object_wipe(j_ptr);
 
        /* Count objects */
@@ -237,14 +229,10 @@ void delete_object(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
-
-               /* Wipe the object */
                object_wipe(o_ptr);
 
                /* Count objects */
@@ -266,20 +254,18 @@ void delete_object(POSITION y, POSITION x)
  * @param i2 整理したい配列の終点
  * @return なし
  */
-static void compact_objects_aux(IDX i1, IDX i2)
+static void compact_objects_aux(OBJECT_IDX i1, OBJECT_IDX i2)
 {
-       IDX i;
+       OBJECT_IDX i;
        cave_type *c_ptr;
        object_type *o_ptr;
 
        /* Do nothing */
        if (i1 == i2) return;
 
-
        /* Repair objects */
        for (i = 1; i < o_max; i++)
        {
-               /* Acquire object */
                o_ptr = &o_list[i];
 
                /* Skip "dead" objects */
@@ -292,12 +278,8 @@ static void compact_objects_aux(IDX i1, IDX i2)
                        o_ptr->next_o_idx = i2;
                }
        }
-
-
-       /* Acquire object */
        o_ptr = &o_list[i1];
 
-
        /* Monster */
        if (o_ptr->held_m_idx)
        {
@@ -334,7 +316,6 @@ static void compact_objects_aux(IDX i1, IDX i2)
                }
        }
 
-
        /* Structure copy */
        o_list[i2] = o_list[i1];
 
@@ -367,15 +348,11 @@ void compact_objects(int size)
        int cur_lev, cur_dis, chance;
        object_type *o_ptr;
 
-
        /* Compact */
        if (size)
        {
                msg_print(_("アイテム情報を圧縮しています...", "Compacting objects..."));
-
-               /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
-
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
        }
 
@@ -524,8 +501,6 @@ void wipe_o_list(void)
                        /* Hack -- see above */
                        c_ptr->o_idx = 0;
                }
-
-               /* Wipe the object */
                object_wipe(o_ptr);
        }
 
@@ -570,8 +545,6 @@ OBJECT_IDX o_pop(void)
        for (i = 1; i < o_max; i++)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[i];
 
                /* Skip live objects */
@@ -4919,11 +4892,7 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
        /* Avoid stacking on other objects */
        if (c_ptr->o_idx) return;
 
-
-       /* Get local object */
        q_ptr = &forge;
-
-       /* Wipe the object */
        object_wipe(q_ptr);
 
        /* Make an object (if possible) */
@@ -4937,8 +4906,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
        if (o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[o_idx];
 
                /* Structure Copy */
@@ -4955,7 +4922,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
 
                note_spot(y, x);
 
-               /* Redraw */
                lite_spot(y, x);
        }
        else
@@ -5040,11 +5006,7 @@ void place_gold(POSITION y, POSITION x)
        /* Avoid stacking on other objects */
        if (c_ptr->o_idx) return;
 
-
-       /* Get local object */
        q_ptr = &forge;
-
-       /* Wipe the object */
        object_wipe(q_ptr);
 
        /* Make some gold */
@@ -5057,8 +5019,6 @@ void place_gold(POSITION y, POSITION x)
        if (o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[o_idx];
 
                /* Copy the object */
@@ -5076,7 +5036,6 @@ void place_gold(POSITION y, POSITION x)
 
                note_spot(y, x);
 
-               /* Redraw */
                lite_spot(y, x);
        }
 }
@@ -5194,8 +5153,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
                        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                        {
                                object_type *o_ptr;
-
-                               /* Acquire object */
                                o_ptr = &o_list[this_o_idx];
 
                                /* Acquire next object */
@@ -5348,8 +5305,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -5460,10 +5415,7 @@ void acquirement(POSITION y1, POSITION x1, int num, bool great, bool special, bo
        /* Acquirement */
        while (num--)
        {
-               /* Get local object */
                i_ptr = &object_type_body;
-
-               /* Wipe the object */
                object_wipe(i_ptr);
 
                /* Make a good (or great) object (if possible) */
@@ -5550,14 +5502,8 @@ void amusement(POSITION y1, POSITION x1, int num, bool known)
                        r -= amuse_info[i].prob;
                        if (r <= 0) break;
                }
-
-               /* Get local object */
                i_ptr = &object_type_body;
-
-               /* Wipe the object */
                object_wipe(i_ptr);
-
-               /* Wipe the object */
                k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
 
                /* Paranoia - reroll if nothing */
@@ -6207,8 +6153,6 @@ INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt)
 
        /* Verify */
        if (amt > o_ptr->number) amt = o_ptr->number;
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Obtain a local object */
@@ -6301,8 +6245,6 @@ void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt)
                o_ptr = &inventory[item];
        }
 
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Obtain local object */
@@ -6478,8 +6420,6 @@ void reorder_pack(void)
 
                /* Take note */
                flag = TRUE;
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Save a copy of the moving item */
@@ -6530,8 +6470,6 @@ void display_koff(KIND_OBJECT_IDX k_idx)
 
        /* No info */
        if (!k_idx) return;
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Prepare the object */