diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:15:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:15:55 +0000 |
| commit | 420044b3c16c778b37fde736c26a7e4863b69a48 (patch) | |
| tree | ea2c8dd236064237dcc4780567449833c92e8333 /crawl-ref/source/item_use.cc | |
| parent | e5f0d4e5bdd06313cffa545cd5d8fe404e015b2e (diff) | |
| download | crawl-ref-420044b3c16c778b37fde736c26a7e4863b69a48.tar.gz crawl-ref-420044b3c16c778b37fde736c26a7e4863b69a48.zip | |
Fix bad potions not counting as useless and thus being auto-picked up.
Fix bad message when using 'W' with no armour and crash when attempting
to enchant armour with no enchantable armour in inventory.
Tweak '{' to only prompt if at least one of autoinscription or clearing
an existing inscription apply. (FR 2017541)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6567 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 00eb067077..88f6d9cb23 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -4101,9 +4101,10 @@ static bool _handle_enchant_armour( int item_slot ) OSEL_ENCH_ARM, true, true, false ); } - if (item_slot == -1) + if (item_slot == PROMPT_ABORT || item_slot == PROMPT_NOTHING) { - canned_msg( MSG_OK ); + if (item_slot == PROMPT_ABORT) + canned_msg( MSG_OK ); return (false); } |