[Refactor] #37353 ref_item()をget_item()の置換向けに修正。

Refine ref_item() for replace of get_item().

diff --git a/src/cmd-item.c b/src/cmd-item.c
index ebb472e..13843b0 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1290,7 +1290,6 @@ static void do_cmd_refill_torch(void)
 
        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
 
-       o_ptr = ref_item(p_ptr, item);
        /* Get the item (in the pack) */
        if (item >= 0)
        {

diff --git a/src/player-item.c b/src/player-item.c
index 3376902..19ca9ad 100644 (file)
--- a/src/player-item.c
+++ b/src/player-item.c
@@ -1,8 +1,15 @@
 #include "angband.h"
 #include "player-item.h"
 
-object_type *ref_item(player_type *player_ptr, INVENTORY_IDX idx)
+/*!
+ * @brief get_item()からのリファクタリング
+ * @return アイテムのポインタ、キャンセルや不能ならNULLを返す。
+ */
+object_type *ref_item(player_type *player_ptr, cptr pmt, cptr str, BIT_FLAGS mode)
 {
+       OBJECT_IDX idx;
        (player_ptr); // しばらくは未使用
+
+       if(!get_item(&idx, pmt, str, mode)) return NULL;
        return idx >= 0 ? &inventory[idx] : &o_list[0 - idx];
 }
\ No newline at end of file

diff --git a/src/player-item.h b/src/player-item.h
index 2b6470f..c76647c 100644 (file)
--- a/src/player-item.h
+++ b/src/player-item.h
@@ -1,2 +1,3 @@
 
-extern object_type *ref_item(player_type *player_ptr, INVENTORY_IDX idx);
+extern object_type *ref_item(player_type *player_ptr, cptr pmt, cptr str, BIT_FLAGS mode);
+