diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-24 06:09:08 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-24 06:09:08 +0000 |
| commit | ed60b40c58c79b13abf54b1a53ae2e2f805a3728 (patch) | |
| tree | 570cba772cff4362042fbf1b640f7723a02cddda /crawl-ref/source/food.cc | |
| parent | e91373c5cee34bd369bc8171161981301099c5a4 (diff) | |
| download | crawl-ref-ed60b40c58c79b13abf54b1a53ae2e2f805a3728.tar.gz crawl-ref-ed60b40c58c79b13abf54b1a53ae2e2f805a3728.zip | |
FR 1993535: If asking the user for an item, and the player has none of the
type of item requested, then mpr() the message about it, rather than bringing
up an empty menu with the message being the menu's title.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6105 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 5f69c4f1ec..81c2d16a18 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -720,11 +720,8 @@ bool prompt_eat_from_inventory(int slot) OPER_EAT ); } - if (which_inventory_slot == PROMPT_ABORT) - { - canned_msg( MSG_OK ); + if (prompt_failed(which_inventory_slot)) return (false); - } // This conditional can later be merged into food::can_ingest() when // expanded to handle more than just OBJ_FOOD 16mar200 {dlb} |