[Refactor] #38997 inven_item_optimize() にplayer_type *引数を追加 / Added player_type ...

diff --git a/src/autopick.c b/src/autopick.c
index e9c2d13..d19aa81 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1650,7 +1650,7 @@ static void autopick_delayed_alter_aux(player_type *player_ptr, INVENTORY_IDX it
        if (item >= 0)
        {
                inven_item_increase(player_ptr, item, -(o_ptr->number));
-               inven_item_optimize(item);
+               inven_item_optimize(player_ptr, item);
        }
 
        /* Eliminate the item (from the floor) */

diff --git a/src/birth.c b/src/birth.c
index d2dd46b..2f93e51 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -1987,7 +1987,7 @@ static void wield_all(player_type *creature_ptr)
                if (item >= 0) 
                { 
                        inven_item_increase(creature_ptr, item, -1); 
-                       inven_item_optimize(item); 
+                       inven_item_optimize(creature_ptr, item); 
                } 
  
                /* Decrease the item (from the floor) */ 

diff --git a/src/bldg.c b/src/bldg.c
index 676c537..e53a57f 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3122,7 +3122,7 @@ static PRICE repair_broken_weapon_aux(player_type *player_ptr, PRICE bcost)
 
        /* Decrease material object */
        inven_item_increase(player_ptr, mater, -1);
-       inven_item_optimize(mater);
+       inven_item_optimize(player_ptr, mater);
 
        /* Copyback */
        p_ptr->update |= PU_BONUS;

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index a963937..7813907 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -2466,7 +2466,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID
                inven_item_increase(creature_ptr, item, -1);
                if (!return_when_thrown)
                        inven_item_describe(creature_ptr, item);
-               inven_item_optimize(item);
+               inven_item_optimize(creature_ptr, item);
        }
        else
        {

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index e88383b..ca527dd 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -340,7 +340,7 @@ void do_cmd_wield(player_type *creature_ptr)
        if (item >= 0)
        {
                inven_item_increase(creature_ptr, item, -1);
-               inven_item_optimize(item);
+               inven_item_optimize(creature_ptr, item);
        }
        /* Decrease the item (from the floor) */
        else
@@ -458,7 +458,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
                object_copy(new_o_ptr, o_ptr);
                owner_ptr->total_weight += o_ptr->weight;
                inven_item_increase(owner_ptr, INVEN_LARM, -((int)o_ptr->number));
-               inven_item_optimize(INVEN_LARM);
+               inven_item_optimize(owner_ptr, INVEN_LARM);
                if (object_allow_two_hands_wielding(o_ptr) && CAN_TWO_HANDS_WIELDING())
                        msg_format(_("%sを両手で構えた。", "You are wielding %s with both hands."), o_name);
                else
@@ -485,7 +485,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
        object_copy(new_o_ptr, o_ptr);
        owner_ptr->total_weight += o_ptr->weight;
        inven_item_increase(owner_ptr, INVEN_RARM, -((int)o_ptr->number));
-       inven_item_optimize(INVEN_RARM);
+       inven_item_optimize(owner_ptr, INVEN_RARM);
        msg_format(_("%sを持ち替えた。", "You switched hand of %s."), o_name);
 }
 

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index 334cf6a..fd16eaa 100644 (file)
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -3051,7 +3051,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
 
                                                /* Steal the items */
                                                inven_item_increase(target_ptr, i, -1);
-                                               inven_item_optimize(i);
+                                               inven_item_optimize(target_ptr, i);
 
                                                obvious = TRUE;
 
@@ -3092,7 +3092,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
 
                                                /* Steal the items */
                                                inven_item_increase(target_ptr, i, -1);
-                                               inven_item_optimize(i);
+                                               inven_item_optimize(target_ptr, i);
 
                                                obvious = TRUE;
 

diff --git a/src/object.h b/src/object.h
index aa950f2..2205b56 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -493,7 +493,7 @@ extern void vary_item(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER nu
 extern void inven_item_charges(player_type *owner_ptr, INVENTORY_IDX item);
 extern void inven_item_describe(player_type *owner_ptr, INVENTORY_IDX item);
 extern void inven_item_increase(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER num);
-extern void inven_item_optimize(INVENTORY_IDX item);
+extern void inven_item_optimize(player_type *owner_ptr, INVENTORY_IDX item);
 extern void floor_item_charges(INVENTORY_IDX item);
 extern void floor_item_describe(INVENTORY_IDX item);
 extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);

diff --git a/src/object2.c b/src/object2.c
index 85449db..55bbba3 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4587,7 +4587,7 @@ void vary_item(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER num)
        {
                inven_item_increase(owner_ptr, item, num);
                inven_item_describe(owner_ptr, item);
-               inven_item_optimize(item);
+               inven_item_optimize(owner_ptr, item);
        }
        else
        {
@@ -4650,9 +4650,9 @@ void inven_item_increase(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER
  * @param item 消去したいプレイヤーのアイテム所持スロット
  * @return なし
  */
-void inven_item_optimize(INVENTORY_IDX item)
+void inven_item_optimize(player_type *owner_ptr, INVENTORY_IDX item)
 {
-       object_type *o_ptr = &p_ptr->inventory_list[item];
+       object_type *o_ptr = &owner_ptr->inventory_list[item];
 
        /* Only optimize real items */
        if (!o_ptr->k_idx) return;
@@ -4666,37 +4666,37 @@ void inven_item_optimize(INVENTORY_IDX item)
                int i;
 
                /* One less item */
-               p_ptr->inven_cnt--;
+               owner_ptr->inven_cnt--;
 
                /* Slide everything down */
                for (i = item; i < INVEN_PACK; i++)
                {
                        /* Structure copy */
-                       p_ptr->inventory_list[i] = p_ptr->inventory_list[i + 1];
+                       owner_ptr->inventory_list[i] = owner_ptr->inventory_list[i + 1];
                }
 
                /* Erase the "final" slot */
-               object_wipe(&p_ptr->inventory_list[i]);
+               object_wipe(&owner_ptr->inventory_list[i]);
 
-               p_ptr->window |= (PW_INVEN);
+               owner_ptr->window |= (PW_INVEN);
        }
 
        /* The item is being wielded */
        else
        {
                /* One less item */
-               p_ptr->equip_cnt--;
+               owner_ptr->equip_cnt--;
 
                /* Erase the empty slot */
-               object_wipe(&p_ptr->inventory_list[item]);
-               p_ptr->update |= (PU_BONUS);
-               p_ptr->update |= (PU_TORCH);
-               p_ptr->update |= (PU_MANA);
+               object_wipe(&owner_ptr->inventory_list[item]);
+               owner_ptr->update |= (PU_BONUS);
+               owner_ptr->update |= (PU_TORCH);
+               owner_ptr->update |= (PU_MANA);
 
-               p_ptr->window |= (PW_EQUIP);
+               owner_ptr->window |= (PW_EQUIP);
        }
 
-       p_ptr->window |= (PW_SPELL);
+       owner_ptr->window |= (PW_SPELL);
 }
 
 
@@ -5129,7 +5129,7 @@ INVENTORY_IDX inven_takeoff(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUM
 
        /* Modify, Optimize */
        inven_item_increase(owner_ptr, item, -amt);
-       inven_item_optimize(item);
+       inven_item_optimize(owner_ptr, item);
 
        /* Carry the object */
        slot = inven_carry(owner_ptr, q_ptr);

diff --git a/src/player-damage.c b/src/player-damage.c
index 08a4bd2..4a98293 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -109,7 +109,7 @@ void inventory_damage(player_type *player_ptr, inven_func typ, int perc)
 
                /* Destroy "amt" items */
                inven_item_increase(player_ptr, i, -amt);
-               inven_item_optimize(i);
+               inven_item_optimize(player_ptr, i);
        }
 }
 

diff --git a/src/spells-status.c b/src/spells-status.c
index f828b8c..c5f8a63 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -473,7 +473,7 @@ bool cosmic_cast_off(player_type *creature_ptr, object_type *o_ptr)
        object_type forge;
        object_copy(&forge, o_ptr);
        inven_item_increase(creature_ptr, inv, (0 - o_ptr->number));
-       inven_item_optimize(inv);
+       inven_item_optimize(creature_ptr, inv);
        OBJECT_IDX o_idx = drop_near(creature_ptr, &forge, 0, creature_ptr->y, creature_ptr->x);
        o_ptr = &creature_ptr->current_floor_ptr->o_list[o_idx];
 

diff --git a/src/store.c b/src/store.c
index 5c32532..36da10d 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5095,7 +5095,7 @@ static void store_sell(player_type *owner_ptr)
                        if (o_ptr->number > 0)
                                autopick_alter_item(item, FALSE);
 
-                       inven_item_optimize(item);
+                       inven_item_optimize(owner_ptr, item);
                        handle_stuff(owner_ptr);
 
                        /* The store gets that (known) item */