From 46db4cb5a4a05c7a9bb89ceee531d9ee2f35e9fe Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Thu, 7 Nov 2002 03:27:37 +0000 Subject: [PATCH] high temple entry From the newsgroup: temples attended by high priests on the Astral Plane (also in Moloch's Sanctum, although that one doesn't really matter) give a different entry greeting than usual in order to conceal the altar's alignment, but they were including the patron deity in the priest name given as presenter of the message ("The high priest of Offler intones:"). --- doc/fixes34.1 | 1 + src/priest.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index 902ed8b5e..92778379c 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -296,6 +296,7 @@ becoming confused, eg from nausia, while reading a spellbook should result in the usual confusion effects level teleports should not be controlled if you're confused vault wall repair should remove traps subsequently created at affected spots +don't reveal deity name when a high priest(ess) gives temple entry greeting Platform- and/or Interface-Specific Fixes diff --git a/src/priest.c b/src/priest.c index 774c16d50..6404bbed2 100644 --- a/src/priest.c +++ b/src/priest.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)priest.c 3.4 2001/11/07 */ +/* SCCS Id: @(#)priest.c 3.4 2002/11/06 */ /* Copyright (c) Izchak Miller, Steve Linhart, 1989. */ /* NetHack may be freely redistributed. See license for details. */ @@ -338,13 +338,20 @@ register int roomno; (Is_sanctum(&u.uz) || In_endgame(&u.uz))); can_speak = (priest->mcanmove && !priest->msleeping && flags.soundok); - if (can_speak) + if (can_speak) { + unsigned save_priest = priest->ispriest; + /* don't reveal the altar's owner upon temple entry in + the endgame; for the Sanctum, the next message names + Moloch so suppress the "of Moloch" for him here too */ + if (sanctum && !Hallucination) priest->ispriest = 0; pline("%s intones:", - (!Blind ? Monnam(priest) : "A nearby voice")); + canseemon(priest) ? Monnam(priest) : "A nearby voice"); + priest->ispriest = save_priest; + } msg2 = 0; if(sanctum && Is_sanctum(&u.uz)) { if(priest->mpeaceful) { - msg1 = "Infidel, you entered Moloch's Sanctum!"; + msg1 = "Infidel, you have entered Moloch's Sanctum!"; msg2 = "Be gone!"; priest->mpeaceful = 0; set_malign(priest); -- 2.40.0