summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-23 18:35:21 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-23 18:35:21 +0000
commit764966f7e59634c19b6188ed8fef7f8dd0b93c93 (patch)
treec5740ea70264b43e0c4f58e887e012f30061d211 /crawl-ref/source/item_use.cc
parent093e48fae110d3856da6420ec7d6b1cead90579c (diff)
downloadcrawl-ref-764966f7e59634c19b6188ed8fef7f8dd0b93c93.tar.gz
crawl-ref-764966f7e59634c19b6188ed8fef7f8dd0b93c93.zip
Fix evoking the box of the beasts or the efreet flask destroying or
modifying the wielded weapon rather than the misc. item in question. Also update tooltips. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9802 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 961dd0842b..60547947e4 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -5491,8 +5491,8 @@ void tile_item_use(int idx)
evoke_item(idx);
return;
}
- // Unwield staves or weapons.
- if (check_warning_inscriptions(item, OPER_WIELD))
+ // Unwield wielded items.
+ if (equipped && check_warning_inscriptions(item, OPER_WIELD))
wield_weapon(true, PROMPT_GOT_SPECIAL); // unwield
return;