diff options
| author | Johanna Ploog <j-p-e-g@sourceforge.net> | 2011-02-03 23:46:20 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@sourceforge.net> | 2011-02-04 00:10:56 +0100 |
| commit | 3279d8d5a96ebf4a342735ea5f748a284da644c2 (patch) | |
| tree | 03acf0c301395e8808c17a27108bfafbf92cf283 /crawl-ref/source/tilereg-inv.cc | |
| parent | ed87c10e1fb86874f94197c6feeaf0bd2f9b8691 (diff) | |
| download | crawl-ref-3279d8d5a96ebf4a342735ea5f748a284da644c2.tar.gz crawl-ref-3279d8d5a96ebf4a342735ea5f748a284da644c2.zip | |
Fix #2726: Wrong tooltip for evokable staves.
Diffstat (limited to 'crawl-ref/source/tilereg-inv.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-inv.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc index 53fb4ed6bd..960c52854a 100644 --- a/crawl-ref/source/tilereg-inv.cc +++ b/crawl-ref/source/tilereg-inv.cc @@ -14,6 +14,7 @@ #include "describe.h" #include "env.h" #include "food.h" +#include "invent.h" #include "itemname.h" #include "itemprop.h" #include "items.h" @@ -215,7 +216,7 @@ static bool _can_use_item(const item_def &item, bool equipped) if (equipped && item.cursed()) { // Misc. items/rods can always be evoked, cursed or not. - if (item.base_type == OBJ_MISCELLANY || item_is_rod(item)) + if (item_is_evokable(item)) return (true); // You can't unwield/fire a wielded cursed weapon/staff @@ -348,7 +349,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) std::string tmp = ""; if (equipped) { - if (wielded && type != OBJ_MISCELLANY && !item_is_rod(item)) + if (wielded && !item_is_evokable(item)) { if (type == OBJ_JEWELLERY || type == OBJ_ARMOUR || type == OBJ_WEAPONS || type == OBJ_STAVES) |