summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-inv.cc
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2011-04-14 17:07:00 +0200
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2011-04-14 17:07:00 +0200
commitb3b59a4e93ddb5de510d01dd2d1797794137cc47 (patch)
tree143c1807f78c25bdb5122af1da6f60b83c317c93 /crawl-ref/source/tilereg-inv.cc
parentf543e09473991d59faf67bde5963693202f7fc0e (diff)
downloadcrawl-ref-b3b59a4e93ddb5de510d01dd2d1797794137cc47.tar.gz
crawl-ref-b3b59a4e93ddb5de510d01dd2d1797794137cc47.zip
Mantis #1372: Allow mouseclick-wielding ammunition (for enchantment).
This is likely to be confusing to players who don't know about enchantment - they might end up thinking bashing monsters with arrows might be useful - but it does make it more comfortable to wield ammo you wish to enchant. A proper solution to this dilemma would be to change the EW scrolls to prompt for a target item instead of always using the wielded one.
Diffstat (limited to 'crawl-ref/source/tilereg-inv.cc')
-rw-r--r--crawl-ref/source/tilereg-inv.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc
index 199f6e375b..cd2a66c9af 100644
--- a/crawl-ref/source/tilereg-inv.cc
+++ b/crawl-ref/source/tilereg-inv.cc
@@ -428,17 +428,8 @@ bool InventoryRegion::update_tip_text(std::string& tip)
tmp += "Fire (%)";
cmd.push_back(CMD_FIRE);
- if (wielded)
- _handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ", true);
- else if (item.sub_type == MI_STONE
- && you.has_spell(SPELL_SANDBLAST)
- || item.sub_type == MI_ARROW
- && you.has_spell(SPELL_STICKS_TO_SNAKES))
- {
- // For Sandblast and Sticks to Snakes,
- // respectively.
- _handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ");
- }
+ if (wielded || you.can_wield(item))
+ _handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ", wielded);
}
break;
case OBJ_WANDS: