From: PatR Date: Sun, 13 Dec 2015 04:56:46 +0000 (-0800) Subject: fix part of #H4062 - high priest name refusal X-Git-Tag: NetHack-3.6.1_RC01~1182 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ad39ba2828854c8f844361d6247c0b96f892ce0;p=nethack 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 f673d44a9..efd39ad2e 100644 --- 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 2592d7036..e033e46e0 100644 --- 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