fix part of #H4062 - high priest name refusal

    High priests used a different message to refuse accepting a user-supplied
    name than regular temple priests because they're flagged as unique.  The
    effect was cosmetic; it didn't reopen the hole that let you recognize
    which high priest was which via the 'C' command on the Astral Plane.

    [I never received the mail for #H4062 but saw it in bugzilla.]

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index f673d44a92aadecd23215db8171adf562f850220..efd39ad2ed70f179e81ddd73248d15d6fb710889 100644 (file)
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -22,6 +22,8 @@ slice of {pizza,cake,&} pluralized as "slouse of ..." due to false match
 change dipping prompt to not ignore 'called' and 'named' attributes of item
        to be dipped
 avoid 'the unlabeled {scroll,spellbook} fades' when blank item is hit by water
+wrong message given when high priest on astral plane rejects being assigned a
+       name (got the one for unique monsters instead of the one for priests)
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/do_name.c b/src/do_name.c
index 2592d70368815e20094187f0e879134f5acf0c3c..e033e46e0faab6684a6601d9b452593785e9e388 100644 (file)
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 do_name.c       $NHDT-Date: 1449914085 2015/12/12 09:54:45 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.78 $ */
+/* NetHack 3.6 do_name.c       $NHDT-Date: 1449982602 2015/12/13 04:56:42 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.79 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -463,7 +463,7 @@ do_mname()
     /* unique monsters have their own specific names or titles;
        shopkeepers, temple priests and other minions use alternate
        name formatting routines which ignore any user-supplied name */
-    if (mtmp->data->geno & G_UNIQ)
+    if ((mtmp->data->geno & G_UNIQ) && !mtmp->ispriest)
         pline("%s doesn't like being called names!", upstart(monnambuf));
     else if (mtmp->isshk
              && !(Deaf || mtmp->msleeping || !mtmp->mcanmove