summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/invent.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-15 20:15:55 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-15 20:15:55 +0000
commit420044b3c16c778b37fde736c26a7e4863b69a48 (patch)
treeea2c8dd236064237dcc4780567449833c92e8333 /crawl-ref/source/invent.cc
parente5f0d4e5bdd06313cffa545cd5d8fe404e015b2e (diff)
downloadcrawl-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/invent.cc')
-rw-r--r--crawl-ref/source/invent.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index f4279e30cd..16643193fb 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -335,6 +335,8 @@ static std::string _no_selectables_message(int item_selector)
case OSEL_WIELD:
case OBJ_WEAPONS:
return("You aren't carrying any weapons.");
+ case OBJ_ARMOUR:
+ return("You aren't carrying any armour.");
case OSEL_UNIDENT:
return("You don't have any unidentified items.");
case OSEL_MEMORISE:
@@ -342,7 +344,6 @@ static std::string _no_selectables_message(int item_selector)
case OSEL_RECHARGE:
return("You aren't carrying any rechargable items.");
case OSEL_ENCH_ARM:
- case OBJ_ARMOUR:
return("You aren't carrying any armour which can be enchanted "
"further.");
case OBJ_CORPSES: