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/decks.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/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 532674e323..ff4fecc5f2 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -712,11 +712,8 @@ static int _choose_inventory_deck( const char* prompt ) true, true, true, 0, NULL, OPER_EVOKE ); - if ( slot == PROMPT_ABORT ) - { - canned_msg(MSG_OK); + if (prompt_failed(slot)) return -1; - } if ( !is_deck(you.inv[slot]) ) { |