[Fix] アイテム選択時にアルファベットのタグを選択すると!*の確認が無視される #642

diff --git a/src/inventory/floor-item-getter.cpp b/src/inventory/floor-item-getter.cpp
index 7fa9b3e..5a06b57 100644 (file)
--- a/src/inventory/floor-item-getter.cpp
+++ b/src/inventory/floor-item-getter.cpp
@@ -753,63 +753,53 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp
         }
             /* Fall through */
         default: {
-            int ver;
+            bool tag_not_found = FALSE;
+
             if (command_wrk != USE_FLOOR) {
-                bool not_found = FALSE;
                 if (!get_tag(owner_ptr, &fis_ptr->k, fis_ptr->which, command_wrk, fis_ptr->tval))
-                    not_found = TRUE;
+                    tag_not_found = TRUE;
                 else if ((fis_ptr->k < INVEN_MAIN_HAND) ? !fis_ptr->inven : !fis_ptr->equip)
-                    not_found = TRUE;
-                else if (!get_item_okay(owner_ptr, fis_ptr->k, fis_ptr->tval))
-                    not_found = TRUE;
+                    tag_not_found = TRUE;
 
-                if (!not_found) {
-                    *cp = fis_ptr->k;
-                    fis_ptr->item = TRUE;
-                    fis_ptr->done = TRUE;
+                if (!tag_not_found)
                     fis_ptr->cur_tag = fis_ptr->which;
-                    break;
-                }
             } else {
                 if (get_tag_floor(owner_ptr->current_floor_ptr, &fis_ptr->k, fis_ptr->which, fis_ptr->floor_list, fis_ptr->floor_num)) {
                     fis_ptr->k = 0 - fis_ptr->floor_list[fis_ptr->k];
-                    *cp = fis_ptr->k;
-                    fis_ptr->item = TRUE;
-                    fis_ptr->done = TRUE;
                     fis_ptr->cur_tag = fis_ptr->which;
-                    break;
                 }
             }
 
-            ver = isupper(fis_ptr->which);
-            fis_ptr->which = (char)tolower(fis_ptr->which);
-            if (command_wrk == (USE_INVEN)) {
-                if (fis_ptr->which == '(')
-                    fis_ptr->k = fis_ptr->i1;
-                else if (fis_ptr->which == ')')
-                    fis_ptr->k = fis_ptr->i2;
-                else
-                    fis_ptr->k = label_to_inventory(owner_ptr, fis_ptr->which);
-            } else if (command_wrk == (USE_EQUIP)) {
-                if (fis_ptr->which == '(')
-                    fis_ptr->k = fis_ptr->e1;
-                else if (fis_ptr->which == ')')
-                    fis_ptr->k = fis_ptr->e2;
-                else
-                    fis_ptr->k = label_to_equipment(owner_ptr, fis_ptr->which);
-            } else if (command_wrk == USE_FLOOR) {
-                if (fis_ptr->which == '(')
-                    fis_ptr->k = 0;
-                else if (fis_ptr->which == ')')
-                    fis_ptr->k = fis_ptr->floor_num - 1;
-                else
-                    fis_ptr->k = islower(fis_ptr->which) ? A2I(fis_ptr->which) : -1;
-                if (fis_ptr->k < 0 || fis_ptr->k >= fis_ptr->floor_num || fis_ptr->k >= 23) {
-                    bell();
-                    break;
-                }
+            if (tag_not_found) {
+                fis_ptr->which = (char)tolower(fis_ptr->which);
+                if (command_wrk == (USE_INVEN)) {
+                    if (fis_ptr->which == '(')
+                        fis_ptr->k = fis_ptr->i1;
+                    else if (fis_ptr->which == ')')
+                        fis_ptr->k = fis_ptr->i2;
+                    else
+                        fis_ptr->k = label_to_inventory(owner_ptr, fis_ptr->which);
+                } else if (command_wrk == (USE_EQUIP)) {
+                    if (fis_ptr->which == '(')
+                        fis_ptr->k = fis_ptr->e1;
+                    else if (fis_ptr->which == ')')
+                        fis_ptr->k = fis_ptr->e2;
+                    else
+                        fis_ptr->k = label_to_equipment(owner_ptr, fis_ptr->which);
+                } else if (command_wrk == USE_FLOOR) {
+                    if (fis_ptr->which == '(')
+                        fis_ptr->k = 0;
+                    else if (fis_ptr->which == ')')
+                        fis_ptr->k = fis_ptr->floor_num - 1;
+                    else
+                        fis_ptr->k = islower(fis_ptr->which) ? A2I(fis_ptr->which) : -1;
+                    if (fis_ptr->k < 0 || fis_ptr->k >= fis_ptr->floor_num || fis_ptr->k >= 23) {
+                        bell();
+                        break;
+                    }
 
-                fis_ptr->k = 0 - fis_ptr->floor_list[fis_ptr->k];
+                    fis_ptr->k = 0 - fis_ptr->floor_list[fis_ptr->k];
+                }
             }
 
             if ((command_wrk != USE_FLOOR) && !get_item_okay(owner_ptr, fis_ptr->k, fis_ptr->tval)) {
@@ -817,6 +807,7 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp
                 break;
             }
 
+            int ver = isupper(fis_ptr->which);
             if (ver && !verify(owner_ptr, _("本当に", "Try"), fis_ptr->k)) {
                 fis_ptr->done = TRUE;
                 break;

diff --git a/src/inventory/item-getter.cpp b/src/inventory/item-getter.cpp
index 115b527..743f77b 100644 (file)
--- a/src/inventory/item-getter.cpp
+++ b/src/inventory/item-getter.cpp
@@ -541,40 +541,33 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str,
         }
             /* Fall through */
         default: {
-            int ver;
-            bool not_found = FALSE;
+            bool tag_not_found = FALSE;
+
             if (!get_tag(owner_ptr, &item_selection_ptr->k, item_selection_ptr->which, command_wrk ? USE_EQUIP : USE_INVEN, item_selection_ptr->tval)) {
-                not_found = TRUE;
+                tag_not_found = TRUE;
             } else if ((item_selection_ptr->k < INVEN_MAIN_HAND) ? !item_selection_ptr->inven : !item_selection_ptr->equip) {
-                not_found = TRUE;
-            } else if (!get_item_okay(owner_ptr, item_selection_ptr->k, item_selection_ptr->tval)) {
-                not_found = TRUE;
+                tag_not_found = TRUE;
             }
 
-            if (!not_found) {
-                *item_selection_ptr->cp = item_selection_ptr->k;
-                item_selection_ptr->item = TRUE;
-                item_selection_ptr->done = TRUE;
+            if (!tag_not_found)
                 item_selection_ptr->cur_tag = item_selection_ptr->which;
-                break;
-            }
-
-            ver = isupper(item_selection_ptr->which);
-            item_selection_ptr->which = (char)tolower(item_selection_ptr->which);
-            if (!command_wrk) {
-                if (item_selection_ptr->which == '(')
-                    item_selection_ptr->k = item_selection_ptr->i1;
-                else if (item_selection_ptr->which == ')')
-                    item_selection_ptr->k = item_selection_ptr->i2;
-                else
-                    item_selection_ptr->k = label_to_inventory(owner_ptr, item_selection_ptr->which);
-            } else {
-                if (item_selection_ptr->which == '(')
-                    item_selection_ptr->k = item_selection_ptr->e1;
-                else if (item_selection_ptr->which == ')')
-                    item_selection_ptr->k = item_selection_ptr->e2;
-                else
-                    item_selection_ptr->k = label_to_equipment(owner_ptr, item_selection_ptr->which);
+            else {
+                item_selection_ptr->which = (char)tolower(item_selection_ptr->which);
+                if (!command_wrk) {
+                    if (item_selection_ptr->which == '(')
+                        item_selection_ptr->k = item_selection_ptr->i1;
+                    else if (item_selection_ptr->which == ')')
+                        item_selection_ptr->k = item_selection_ptr->i2;
+                    else
+                        item_selection_ptr->k = label_to_inventory(owner_ptr, item_selection_ptr->which);
+                } else {
+                    if (item_selection_ptr->which == '(')
+                        item_selection_ptr->k = item_selection_ptr->e1;
+                    else if (item_selection_ptr->which == ')')
+                        item_selection_ptr->k = item_selection_ptr->e2;
+                    else
+                        item_selection_ptr->k = label_to_equipment(owner_ptr, item_selection_ptr->which);
+                }
             }
 
             if (!get_item_okay(owner_ptr, item_selection_ptr->k, item_selection_ptr->tval)) {
@@ -582,6 +575,7 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str,
                 break;
             }
 
+            int ver = isupper(item_selection_ptr->which);
             if (ver && !verify(owner_ptr, _("本当に", "Try"), item_selection_ptr->k)) {
                 item_selection_ptr->done = TRUE;
                 break;