From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 15 Jan 2016 20:02:41 +0000 (+0200)
Subject: Fix bz51: Revived unique inherits corpse name
X-Git-Tag: NetHack-3.6.1_RC01~1016
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b4d52397ca73b88d6e104664f411ce6c2a4eede;p=nethack

Fix bz51: Revived unique inherits corpse name
---

diff --git a/src/trap.c b/src/trap.c
index 91bc589d3..4a065d1ef 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -635,7 +635,7 @@ int *fail_reason;
     else if (statue->spe & STATUE_FEMALE)
         mon->female = TRUE;
     /* if statue has been named, give same name to the monster */
-    if (has_oname(statue))
+    if (has_oname(statue) && !unique_corpstat(mon->data))
         mon = christen_monst(mon, ONAME(statue));
     /* mimic statue becomes seen mimic; other hiders won't be hidden */
     if (mon->m_ap_type)
diff --git a/src/zap.c b/src/zap.c
index 4f3dc5707..31d6c2331 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -831,7 +831,7 @@ boolean by_hero;
     }
 
     /* monster retains its name */
-    if (has_oname(corpse))
+    if (has_oname(corpse) && !unique_corpstat(mtmp->data))
         mtmp = christen_monst(mtmp, ONAME(corpse));
     /* partially eaten corpse yields wounded monster */
     if (corpse->oeaten)