summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-cast.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-13 21:20:59 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-13 21:20:59 +0000
commit72d421a98654a1d73704397dfd9a4be3177289d0 (patch)
tree5a0428dd04f392344d89aa99ee4247413d384de3 /crawl-ref/source/spl-cast.cc
parent280d409759be7af8b54366f07ccba17348ea24f9 (diff)
downloadcrawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.tar.gz
crawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.zip
A bug fix commit! (I didn't do one of these in a while...)
* 2856912: being turned into a pig while berserk complaining about being "too berserk" when unequipping the weapon * 2849963: shields working even when melded * 2845355: melded equipment not being affected by remove curse * 2836148: disallow toggle_with_I if you've got a spell on 'I' git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10671 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r--crawl-ref/source/spl-cast.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index f51eb60a69..dfe3135ca8 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -235,6 +235,9 @@ static bool _spell_no_hostile_in_range(spell_type spell, int minRange)
int list_spells(bool toggle_with_I, bool viewing, int minRange)
{
+ if (toggle_with_I && get_spell_by_letter('I') != SPELL_NO_SPELL)
+ toggle_with_I = false;
+
ToggleableMenu spell_menu(MF_SINGLESELECT | MF_ANYPRINTABLE
| MF_ALWAYS_SHOW_MORE | MF_ALLOW_FORMATTING);
#ifdef USE_TILE