diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
| commit | 809ea63fb87708fcb763492e2da99188679ed0f4 (patch) | |
| tree | de25799e8538d30d4eb5dcfa37a7bc328ea491c3 /crawl-ref/source/tilereg-inv.cc | |
| parent | 77b621a0ace27951fc2f24ab357f69430bcbfd67 (diff) | |
| parent | 96f00b85b9271dade59c577353651eca1e88e0cd (diff) | |
| download | crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.tar.gz crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/actor.cc
crawl-ref/source/delay.cc
crawl-ref/source/directn.cc
crawl-ref/source/directn.h
crawl-ref/source/fight.cc
crawl-ref/source/files.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/monster.cc
crawl-ref/source/mpr.h
crawl-ref/source/player.cc
crawl-ref/source/shopping.cc
Diffstat (limited to 'crawl-ref/source/tilereg-inv.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-inv.cc | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc index 7a9a418d05..4fd17b8110 100644 --- a/crawl-ref/source/tilereg-inv.cc +++ b/crawl-ref/source/tilereg-inv.cc @@ -1,9 +1,3 @@ -/* - * File: tilereg-inv.cc - * - * Created by: ennewalker on Sat Jan 5 01:33:53 2008 UTC - */ - #include "AppHdr.h" #ifdef USE_TILE @@ -434,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: |