*/
static bool get_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis_ptr, char *prev_tag)
{
- if ((*prev_tag == '\0') || !command_cmd)
- return FALSE;
-
bool flag = FALSE;
item_use_flag use_flag = (*fis_ptr->cp >= INVEN_MAIN_HAND) ? USE_EQUIP : USE_INVEN;
else
flag |= !fis_ptr->equip;
- if (!flag) {
+ if (flag) {
*prev_tag = '\0';
return FALSE;
}
&& (!fis_ptr->equip || (*fis_ptr->cp < INVEN_MAIN_HAND) || (*fis_ptr->cp >= INVEN_TOTAL)))
return FALSE;
- if (get_floor_item_tag_inventory(owner_ptr, fis_ptr, prev_tag))
- return TRUE;
+ if ((*prev_tag != '\0') && command_cmd)
+ return get_floor_item_tag_inventory(owner_ptr, fis_ptr, prev_tag);
if (get_item_okay(owner_ptr, *fis_ptr->cp, fis_ptr->tval)) {
fis_ptr->tval = 0;