summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/skill_menu.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2011-12-07 04:11:39 -0500
committerNeil Moore <neil@s-z.org>2011-12-07 04:11:39 -0500
commit5e9deab8131371b54ba1b7611fd620fe80f9d407 (patch)
tree39933a1935c3e0dac1df7880488586b96afa82fb /crawl-ref/source/skill_menu.cc
parent0ba7ce2a02fc5d3815d739f854b2b09043dd1295 (diff)
downloadcrawl-ref-5e9deab8131371b54ba1b7611fd620fe80f9d407.tar.gz
crawl-ref-5e9deab8131371b54ba1b7611fd620fe80f9d407.zip
Avoid a rare unexitable skill menu (Fyren).
If you had all non-useless skills but one at level 27, and that skill was not currently trainable, you would not be able to leave the skill menu. Fixed #4910.
Diffstat (limited to 'crawl-ref/source/skill_menu.cc')
-rw-r--r--crawl-ref/source/skill_menu.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/skill_menu.cc b/crawl-ref/source/skill_menu.cc
index 764a598a63..6a0aae4c8a 100644
--- a/crawl-ref/source/skill_menu.cc
+++ b/crawl-ref/source/skill_menu.cc
@@ -781,8 +781,11 @@ bool SkillMenu::exit()
break;
}
- if (you.skills[i] < 27 && !is_useless_skill((skill_type)i))
+ if (you.skills[i] < 27 && you.can_train[i]
+ && !is_useless_skill((skill_type) i))
+ {
maxed_out = false;
+ }
}
if (!enabled_skill && !maxed_out)