[Refactor] #38997 object_desc() と screen_object()にplayer_type * 引数を追加 / Added player_...

[hengband/hengband.git] / src / cmd / cmd-item.c

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index f449c24..306c96b 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -264,7 +264,7 @@ void do_cmd_wield(player_type *creature_ptr)
        /* Prevent wielding into a cursed slot */
        if (object_is_cursed(&creature_ptr->inventory_list[slot]))
        {
-               object_desc(o_name, &creature_ptr->inventory_list[slot], (OD_OMIT_PREFIX | OD_NAME_ONLY));
+               object_desc(creature_ptr, o_name, &creature_ptr->inventory_list[slot], (OD_OMIT_PREFIX | OD_NAME_ONLY));
 #ifdef JP
                msg_format("%s%sは呪われているようだ。", describe_use(creature_ptr, slot), o_name);
 #else
@@ -280,7 +280,7 @@ void do_cmd_wield(player_type *creature_ptr)
        {
                char dummy[MAX_NLEN+80];
 
-               object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+               object_desc(creature_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
                sprintf(dummy, _("本当に%s{呪われている}を使いますか？", "Really use the %s {cursed}? "), o_name);
 
                if (!get_check(dummy)) return;
@@ -290,7 +290,7 @@ void do_cmd_wield(player_type *creature_ptr)
        {
                char dummy[MAX_NLEN+100];
 
-               object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+               object_desc(creature_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
                sprintf(dummy, _("%sを装備すると吸血鬼になります。よろしいですか？",
                        "%s will transforms you into a vampire permanently when equiped. Do you become a vampire?"), o_name);
@@ -306,7 +306,7 @@ void do_cmd_wield(player_type *creature_ptr)
                object_type *otmp_ptr = &object_tmp;
                GAME_TEXT switch_name[MAX_NLEN];
 
-               object_desc(switch_name, switch_o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+               object_desc(creature_ptr, switch_name, switch_o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
                object_copy(otmp_ptr, switch_o_ptr);
                object_copy(switch_o_ptr, slot_o_ptr);
@@ -347,7 +347,7 @@ void do_cmd_wield(player_type *creature_ptr)
        else
        {
                floor_item_increase(creature_ptr->current_floor_ptr, 0 - item, -1);
-               floor_item_optimize(creature_ptr->current_floor_ptr, 0 - item);
+               floor_item_optimize(creature_ptr, 0 - item);
        }
 
        /* Access the wield slot */
@@ -404,7 +404,7 @@ void do_cmd_wield(player_type *creature_ptr)
                break;
        }
 
-       object_desc(o_name, o_ptr, 0);
+       object_desc(creature_ptr, o_name, o_ptr, 0);
        msg_format(act, o_name, index_to_label(slot));
 
        /* Cursed! */
@@ -448,7 +448,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
                if (!has_melee_weapon(owner_ptr, INVEN_LARM)) return;
 
                o_ptr = &owner_ptr->inventory_list[INVEN_LARM];
-               object_desc(o_name, o_ptr, 0);
+               object_desc(owner_ptr, o_name, o_ptr, 0);
 
                if (object_is_cursed(o_ptr))
                {
@@ -473,7 +473,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
        if (item != INVEN_LARM) return;
 
        o_ptr = &owner_ptr->inventory_list[INVEN_RARM];
-       if (o_ptr->k_idx) object_desc(o_name, o_ptr, 0);
+       if (o_ptr->k_idx) object_desc(owner_ptr, o_name, o_ptr, 0);
 
        if (has_melee_weapon(owner_ptr, INVEN_RARM))
        {
@@ -646,7 +646,7 @@ void do_cmd_destroy(player_type *creature_ptr)
        /* Verify unless quantity given beforehand */
        if (!force && (confirm_destroy || (object_value(o_ptr) > 0)))
        {
-               object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
+               object_desc(creature_ptr, o_name, o_ptr, OD_OMIT_PREFIX);
 
                /* Make a verification */
                sprintf(out_val, _("本当に%sを壊しますか? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), o_name);
@@ -704,7 +704,7 @@ void do_cmd_destroy(player_type *creature_ptr)
 
        old_number = o_ptr->number;
        o_ptr->number = amt;
-       object_desc(o_name, o_ptr, 0);
+       object_desc(creature_ptr, o_name, o_ptr, 0);
        o_ptr->number = old_number;
 
        take_turn(creature_ptr, 100);
@@ -813,9 +813,9 @@ void do_cmd_observe(player_type *creature_ptr)
                return;
        }
 
-       object_desc(o_name, o_ptr, 0);
+       object_desc(creature_ptr, o_name, o_ptr, 0);
        msg_format(_("%sを調べている...", "Examining %s..."), o_name);
-       if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) msg_print(_("特に変わったところはないようだ。", "You see nothing special."));
+       if (!screen_object(creature_ptr, o_ptr, SCROBJ_FORCE_DETAIL)) msg_print(_("特に変わったところはないようだ。", "You see nothing special."));
 }
 
 
@@ -877,7 +877,7 @@ void do_cmd_inscribe(player_type *creature_ptr)
        if (!o_ptr) return;
 
        /* Describe the activity */
-       object_desc(o_name, o_ptr, OD_OMIT_INSCRIPTION);
+       object_desc(creature_ptr, o_name, o_ptr, OD_OMIT_INSCRIPTION);
 
        msg_format(_("%sに銘を刻む。", "Inscribing %s."), o_name);
        msg_print(NULL);
@@ -1384,7 +1384,7 @@ void do_cmd_query_symbol(player_type *creature_ptr)
                                screen_save();
 
                                /* Recall on screen */
-                               screen_roff(who[i], 0);
+                               screen_roff(creature_ptr, who[i], 0);
                        }
 
                        /* Hack -- Begin the prompt */