Corpse names for unusally named monsters

Fix corpse names (and zombie names) for monsters which are named with
name_adjective, name_suffix or name_replace.

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index f235c04520..97b2cb04d0 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -984,7 +984,13 @@ static bool _raise_remains(const coord_def &pos, int corps, beh_type beha,
     const int monnum = item.orig_monnum - 1;
 
     if (is_named_corpse(item))
-        name_zombie(&menv[monster], monnum, get_corpse_name(item));
+    {
+        unsigned long name_type;
+        std::string name = get_corpse_name(item, &name_type);
+
+        if (name_type == 0 || name_type == MF_NAME_REPLACE)
+            name_zombie(&menv[monster], monnum, name);
+    }
 
     equip_undead(pos, corps, monster, monnum);