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

fix B13007 - wrong article on hallucinogen-distorted ghost

Browse Source 
"Killed by _the_ hallucination-distorted ghost of Foo."  Similar
for invisible; ordinary ghosts already had "the" instead of "a".
This commit is contained in:
nethack.rankin
2002-10-05 06:44:00 +00:00
parent cd62daa465
commit 1c0516ce1e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/end.c
+8 -7
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)end.c 3.4 2002/08/22 */ /* SCCS Id: @(#)end.c 3.4 2002/10/04 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -197,18 +197,19 @@ register struct monst *mtmp;
Strcat(buf, "the "); Strcat(buf, "the ");
killer_format = KILLED_BY; killer_format = KILLED_BY;
} }
/* _the_ <invisible> <distorted> ghost of Dudley */
if (mtmp->data == &mons[PM_GHOST] && mtmp->mnamelth) {
Strcat(buf, "the ");
killer_format = KILLED_BY;
}
if (mtmp->minvis) if (mtmp->minvis)
Strcat(buf, "invisible "); Strcat(buf, "invisible ");
if (distorted) if (distorted)
Strcat(buf, "hallucinogen-distorted "); Strcat(buf, "hallucinogen-distorted ");
if(mtmp->data == &mons[PM_GHOST]) { if(mtmp->data == &mons[PM_GHOST]) {
char *gn = NAME(mtmp); Strcat(buf, "ghost");
if (!distorted && !mtmp->minvis && *gn) { if (mtmp->mnamelth) Sprintf(eos(buf), " of %s", NAME(mtmp));
Strcat(buf, "the ");
killer_format = KILLED_BY;
}
Sprintf(eos(buf), (*gn ? "ghost of %s" : "ghost%s"), gn);
} else if(mtmp->isshk) { } else if(mtmp->isshk) {
Sprintf(eos(buf), "%s %s, the shopkeeper", Sprintf(eos(buf), "%s %s, the shopkeeper",
(mtmp->female ? "Ms." : "Mr."), shkname(mtmp)); (mtmp->female ? "Ms." : "Mr."), shkname(mtmp));