diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-05 22:03:07 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-05 22:03:07 +1000 |
| commit | 504bcf4bd3bc5297ca3c508193d7590bae6c1836 (patch) | |
| tree | f80a50efbea21577b6db8e5dabfd36aa876b090d /crawl-ref/source/tilereg.cc | |
| parent | fc0e79dabbc83e24ac32461ab67cdd1cef765e91 (diff) | |
| download | crawl-ref-504bcf4bd3bc5297ca3c508193d7590bae6c1836.tar.gz crawl-ref-504bcf4bd3bc5297ca3c508193d7590bae6c1836.zip | |
Combine player_knows_spell, player_has_spell into player::has_spell.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 903187da19..cff4edb5ae 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2247,9 +2247,9 @@ bool InventoryRegion::update_tip_text(std::string& tip) if (wielded) tip += "\n[Ctrl-L-Click] Unwield (w-)"; else if (item.sub_type == MI_STONE - && player_knows_spell(SPELL_SANDBLAST) + && you.has_spell(SPELL_SANDBLAST) || item.sub_type == MI_ARROW - && player_knows_spell(SPELL_STICKS_TO_SNAKES)) + && you.has_spell(SPELL_STICKS_TO_SNAKES)) { // For Sandblast and Sticks to Snakes, // respectively. @@ -2284,7 +2284,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) tip += "\n[Ctrl-L-Click] Unwield (w-)"; else if (item_type_known(item) && is_blood_potion(item) - && player_knows_spell(SPELL_SUBLIMATION_OF_BLOOD)) + && you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)) { tip += "\n[Ctrl-L-Click] Wield (w)"; } @@ -2295,7 +2295,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) if (wielded) tip += "\n[Ctrl-L-Click] Unwield (w-)"; else if (item.sub_type == FOOD_CHUNK - && player_knows_spell( + && you.has_spell( SPELL_SUBLIMATION_OF_BLOOD)) { tip += "\n[Ctrl-L-Click] Wield (w)"; @@ -2324,7 +2324,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) { if (wielded) tip += "\n[Ctrl-L-Click] Unwield"; - else if (player_knows_spell(SPELL_BONE_SHARDS)) + else if (you.has_spell(SPELL_BONE_SHARDS)) tip += "\n[Ctrl-L-Click] Wield (w)"; } |