From: Hourier Date: Thu, 9 Jan 2020 14:44:45 +0000 (+0900) Subject: [Refactor] #38997 inven_drop() を drop_from_inventory() に改名 / Renamed inven_drop(... X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=b6d0092ae136000646d52de05351829663ae7edb [Refactor] #38997 inven_drop() を drop_from_inventory() に改名 / Renamed inven_drop() to drop_from_inventory() --- diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c index ef3ac8323..c479946b9 100644 --- a/src/cmd/cmd-item.c +++ b/src/cmd/cmd-item.c @@ -592,7 +592,7 @@ void do_cmd_drop(player_type *creature_ptr) take_turn(creature_ptr, 50); /* Drop (some of) the item */ - inven_drop(creature_ptr, item, amt); + drop_from_inventory(creature_ptr, item, amt); if (item >= INVEN_RARM) { diff --git a/src/core.c b/src/core.c index 886d0fbdf..12c9a96c7 100644 --- a/src/core.c +++ b/src/core.c @@ -2579,7 +2579,7 @@ static void process_world_aux_mutation(player_type *creature_ptr) if (slot && !object_is_cursed(o_ptr)) { msg_print(_("武器を落としてしまった!", "You drop your weapon!")); - inven_drop(creature_ptr, slot, 1); + drop_from_inventory(creature_ptr, slot, 1); } } diff --git a/src/object.h b/src/object.h index 7f85698bd..49d7ae0e6 100644 --- a/src/object.h +++ b/src/object.h @@ -502,7 +502,7 @@ extern bool inven_carry_okay(object_type *o_ptr); extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr); extern s16b inven_carry(player_type *owner_ptr, object_type *o_ptr); extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt); -extern void inven_drop(player_type *owner_type, INVENTORY_IDX item, ITEM_NUMBER amt); +extern void drop_from_inventory(player_type *owner_type, INVENTORY_IDX item, ITEM_NUMBER amt); extern void combine_pack(player_type *owner_ptr); extern void reorder_pack(void); extern void display_koff(KIND_OBJECT_IDX k_idx); diff --git a/src/object2.c b/src/object2.c index e6e875860..c6d276ed5 100644 --- a/src/object2.c +++ b/src/object2.c @@ -5163,7 +5163,7 @@ INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt) * @details * The object will be dropped "near" the current location */ -void inven_drop(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER amt) +void drop_from_inventory(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER amt) { object_type forge; object_type *q_ptr; diff --git a/src/wizard2.c b/src/wizard2.c index 523b7a77a..db4f81dde 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1989,7 +1989,7 @@ void do_cmd_debug(player_type *creature_ptr) INVENTORY_IDX i; for (i = INVEN_TOTAL - 1; i >= 0; i--) { - if (creature_ptr->inventory_list[i].k_idx) inven_drop(creature_ptr, i, 999); + if (creature_ptr->inventory_list[i].k_idx) drop_from_inventory(creature_ptr, i, 999); } player_outfit(creature_ptr); break;