summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mutation.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-11 20:03:20 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-11 20:03:20 +0000
commite80122a2ce9321aaa14f1c80321525fb580182dd (patch)
treeb6e9fc250f364719ad25bdbedbff70a3443b64a7 /crawl-ref/source/mutation.cc
parent294794073634d4aa598858ba8f577b95f606356d (diff)
downloadcrawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.tar.gz
crawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.zip
* Fix 2744875 (mutation screen assert).
* Rename KeymapContext KC_* -> KMC_* to avoid overlap with kill_category KC_*. * Increase odds for chaos brands mimicking brands that hurt the defender. * Tweak chaos_affects_attacker(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9595 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mutation.cc')
-rw-r--r--crawl-ref/source/mutation.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index cf01dc25be..b7c7650cca 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1530,6 +1530,8 @@ formatted_string describe_mutations()
static void _display_vampire_attributes()
{
+ ASSERT(you.species == SP_VAMPIRE);
+
clrscr();
cgotoxy(1,1);
@@ -1623,13 +1625,10 @@ static void _display_vampire_attributes()
const formatted_string vp_props = formatted_string::parse_string(result);
vp_props.display();
- if (you.species == SP_VAMPIRE)
- {
- mouse_control mc(MOUSE_MODE_MORE);
- const int keyin = getch();
- if (keyin == '!' || keyin == CK_MOUSE_CMD)
- display_mutations();
- }
+ mouse_control mc(MOUSE_MODE_MORE);
+ const int keyin = getch();
+ if (keyin == '!' || keyin == CK_MOUSE_CMD)
+ display_mutations();
}
void display_mutations()