From 93e5fe6078c850e8b53a5a761426b2212d1b11ad Mon Sep 17 00:00:00 2001 From: haranp Date: Mon, 25 Sep 2006 20:03:02 +0000 Subject: Fix for bug 1565261: demonspawn can now get mutations when transformed. As far as I see, force_mutation is never true unless we're calling perma_mutate() via demonspawn(). If I'm wrong then I've broken something. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@111 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mutation.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 248eb742e5..568c00aadd 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1126,10 +1126,10 @@ bool mutate(int which_mutation, bool failMsg) } // Undead bodies don't mutate, they fall apart. -- bwr - if (you.is_undead) + // except for demonspawn in lichform -- haranp + if (you.is_undead && !force_mutation) { - if (force_mutation - || (wearing_amulet(AMU_RESIST_MUTATION) && coinflip())) + if (wearing_amulet(AMU_RESIST_MUTATION) && coinflip()) { mpr( "Your body decomposes!" ); @@ -1972,7 +1972,7 @@ void demonspawn(void) } } - // check here so we can see if we need to extent our options: + // check here so we can see if we need to extend our options: if (whichm != -1 && you.mutation[whichm] != 0) whichm = -1; -- cgit v1.2.3-54-g00ecf