Make death effects unaffected by polymorph.

Polymorphing either Pikel, Kirke or Duvessa/Dowan rendered their death
effects useless, as it checked monster->type and not the original
monster (ie, monster->mname).

Instead of checking monster->mname, though, store the name in
monster->props, to stop sorear complaining.

1 files changed, 12 insertions, 2 deletions

diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index da1444d2a9..79bb2488e9 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -1082,11 +1082,21 @@ static void _grab_followers()
         if (fmenv == NULL)
             continue;
 
-        if (fmenv->type == MONS_DUVESSA && fmenv->alive())
+        if ((fmenv->type == MONS_DUVESSA 
+            || (fmenv->props.exists("original_name")
+                && fmenv->props["original_name"].get_string() == "Duvessa"))
+               && fmenv->alive())
+        {
             duvessa = fmenv;
+        }
 
-        if (fmenv->type == MONS_DOWAN && fmenv->alive())
+        if ((fmenv->type == MONS_DOWAN
+            || (fmenv->props.exists("original_name")
+                && fmenv->props["original_name"].get_string() == "Dowan"))
+               && fmenv->alive())
+        {
             dowan = fmenv;
+        }
 
         if (fmenv->wont_attack() && !mons_can_use_stairs(fmenv))
             non_stair_using_allies++;