diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/food.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 71416e87f8..9608329102 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -1302,6 +1302,9 @@ int eat_from_floor(bool skip_chunks) return -1; case 'e': case 'y': + if (!check_warning_inscriptions(*item, OPER_EAT)) + break; + if (can_ingest(item->base_type, item->sub_type, false)) { int ilink = item_on_floor(*item, you.pos()); diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 288950d874..7f2aeb0f94 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1373,7 +1373,8 @@ bool check_warning_inscriptions( const item_def& item, } std::string prompt = "Really " + _operation_verb(oper) + " "; - prompt += item.name(DESC_INVENTORY); + prompt += (in_inventory(item) ? item.name(DESC_INVENTORY) + : item.name(DESC_NOCAP_A)); prompt += "?"; return (yesno(prompt.c_str(), false, 'n') && check_old_item_warning(item, oper)); |