nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

article 'a' for priest names

Browse Source 
|You hear an priestess of Issek incant PHOL ENDE WODAN.

using "an" instead of "a" wasn't because the deity name started
with a vowel, it was because the wrong argument was being passed to
just_an() and just_an("") always yields "an" (actually "an ").

I eventually gave up trying to reproduce the message but am fairly
sure that this fixes it.
This commit is contained in:
PatR
2024-09-20 13:33:52 -07:00
parent e892eb5217
commit 7787d83f50
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/fixes3-7-0.txt
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1483 $ $NHDT-Date: 1726809289 2024/09/20 05:14:49 $
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1484 $ $NHDT-Date: 1726862062 2024/09/20 19:54:22 $
General Fixes and Modified Features
-----------------------------------
@@ -2035,6 +2035,11 @@ if tips were enabled, the getpos/farlook tip clobbered the initial prompt (at
a post-3.6 change to try to cope with invalid light source data when restoring
corrupted save file caused "panic: relink_light_sources" for valid
save file if saved while hero was poly'd into a light emitting monster
priestname() didn't handle "a" vs" "an" prefix correctly; normally priests are
named as "the priest of <deity>" but hearing an unseen priest read a
scroll doesn't force "the" and yielded "You hear an priest of <deity>
incant <scroll>."
Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository

36
src/priest.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 priest.c $NHDT-Date: 1693292537 2023/08/29 07:02:17 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.93 $ */
/* NetHack 3.7 priest.c $NHDT-Date: 1726862063 2024/09/20 19:54:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.103 $ */
/* Copyright (c) Izchak Miller, Steve Linhart, 1989. */
/* NetHack may be freely redistributed. See license for details. */
@@ -314,19 +314,21 @@ priestname(
if (!mon->ispriest && !mon->isminion) /* should never happen... */
return strcpy(pname, what); /* caller must be confused */
/* this was done near the end but we want 'what' to be updated sooner */
if (mon->ispriest || aligned_priest || high_priest)
what = do_hallu ? "poohbah" : mon->female ? "priestess" : "priest";
*pname = '\0';
if (article != ARTICLE_NONE && (!do_hallu || !bogon_is_pname(whatcode))) {
if (article == ARTICLE_YOUR || (article == ARTICLE_A && high_priest))
article = ARTICLE_THE;
if (article == ARTICLE_THE) {
Strcat(pname, "the ");
Strcpy(pname, "the ");
} else if (!strncmpi(what, "Angel ", 6)) {
/* bypass just_an(); it would yield "the " due to capital A */
Strcpy(pname, "an ");
} else {
char buf2[BUFSZ] = DUMMY;
/* don't let "Angel of <foo>" fool an() into using "the " */
Strcpy(buf2, pname);
*buf2 = lowc(*buf2);
(void) just_an(pname, buf2);
(void) just_an(pname, what);
}
}
/* pname[] contains "" or {"a ","an ","the "} */
@@ -338,24 +340,14 @@ priestname(
}
if (mon->isminion && EMIN(mon)->renegade) {
/* avoid "an renegade Angel" */
if (!strcmp(pname, "an ")) /* will fail for "an invisible " */
if (!strcmp(pname, "an ") && !mon->minvis)
Strcpy(pname, "a ");
Strcat(pname, "renegade ");
}
if (mon->ispriest || aligned_priest) { /* high_priest implies ispriest */
if (!aligned_priest && !high_priest) {
; /* polymorphed priest; use ``what'' as is */
} else {
if (high_priest)
Strcat(pname, Hallucination ? "grand " : "high ");
if (Hallucination)
what = "poohbah";
else if (mon->female)
what = "priestess";
else
what = "priest";
}
if (mon->ispriest || aligned_priest) {
if (high_priest)
Strcat(pname, do_hallu ? "grand " : "high ");
} else {
if (mon->mtame && !strcmpi(what, "Angel"))
Strcat(pname, "guardian ");