summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 4e5a2e06bb..11bc7df8da 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1571,6 +1571,10 @@ static bool _is_true_equipped_item(item_def item)
// apart from dropping it.
static bool _can_use_item(const item_def &item, bool equipped)
{
+ // There's nothing you can do with an empty box if you can't unwield it.
+ if (!equipped && item.sub_type == MISC_EMPTY_EBONY_CASKET)
+ return (false);
+
// Vampires can drain corpses.
if (item.base_type == OBJ_CORPSES)
{
@@ -1691,7 +1695,6 @@ bool InventoryRegion::update_tip_text(std::string& tip)
// first equipable categories
case OBJ_WEAPONS:
case OBJ_STAVES:
- case OBJ_MISCELLANY:
tip += "Wield (w)";
if (is_throwable(&you, item))
tip += "\n[Ctrl-L-Click] Fire (f)";
@@ -1701,6 +1704,15 @@ bool InventoryRegion::update_tip_text(std::string& tip)
if (is_throwable(&you, item))
tip += "\n[Ctrl-L-Click] Fire (f)";
break;
+ case OBJ_MISCELLANY:
+ if (item.sub_type >= MISC_DECK_OF_ESCAPE
+ && item.sub_type <= MISC_DECK_OF_DEFENCE)
+ {
+ tip += "Wield (w)";
+ break;
+ }
+ tip += "Evoke (V)";
+ break;
case OBJ_MISCELLANY + EQUIP_OFFSET:
if (item.sub_type >= MISC_DECK_OF_ESCAPE
&& item.sub_type <= MISC_DECK_OF_DEFENCE)