[Refactor] #38824 get_item() を choose_object() に置換中。 / Replacing get_item() to choose...

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 44cc26c..a73b211 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -641,7 +641,7 @@ void do_cmd_quaff_potion(void)
        q = _("どの薬を飲みますか? ", "Quaff which potion? ");\r
        s = _("飲める薬がない。", "You have no potions to quaff.");\r
 \r
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
 \r
        /* Quaff the potion */\r
        do_cmd_quaff_potion_aux(item);\r

diff --git a/src/cmd-read.c b/src/cmd-read.c
index c3b4e80..1a20b4e 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -653,19 +653,8 @@ void do_cmd_read_scroll(void)
        q = _("どの巻物を読みますか? ", "Read which scroll? ");\r
        s = _("読める巻物がない。", "You have no scrolls to read.");\r
 \r
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
-\r
-       /* Get the item (in the pack) */\r
-       if (item >= 0)\r
-       {\r
-               o_ptr = &inventory[item];\r
-       }\r
-\r
-       /* Get the item (on the floor) */\r
-       else\r
-       {\r
-               o_ptr = &o_list[0 - item];\r
-       }\r
+       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));\r
+       if (!o_ptr) return;\r
 \r
        /* Read the scroll */\r
        do_cmd_read_scroll_aux(item, object_is_aware(o_ptr));\r

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 57fba69..51c129c 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -496,7 +496,7 @@ void do_cmd_use_staff(void)
        q = _("どの杖を使いますか? ", "Use which staff? ");\r
        s = _("使える杖がない。", "You have no staff to use.");\r
 \r
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
 \r
        do_cmd_use_staff_aux(item);\r
 }\r

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index 655ae0a..29350ba 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -420,7 +420,7 @@ void do_cmd_zap_rod(void)
        q = _("どのロッドを振りますか? ", "Zap which rod? ");
        s = _("使えるロッドがない。", "You have no rod to zap.");
 
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
 
        /* Zap the rod */
        do_cmd_zap_rod_aux(item);

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 298531e..2e066d1 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -473,7 +473,7 @@ void do_cmd_aim_wand(void)
 
        q = _("どの魔法棒で狙いますか? ", "Aim which wand? ");
        s = _("使える魔法棒がない。", "You have no wand to aim.");
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
 
        do_cmd_aim_wand_aux(item);
 }

diff --git a/src/hissatsu.c b/src/hissatsu.c
index ad6256b..c069347 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -422,19 +422,8 @@ void do_cmd_gain_hissatsu(void)
        q = _("どの書から学びますか? ", "Study which book? ");
        s = _("読める書がない。", "You have no books that you can read.");
 
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
+       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
+       if (!o_ptr) return;
 
        for (i = o_ptr->sval * 8; i < o_ptr->sval * 8 + 8; i++)
        {