fix incorrect plural of Nazgul

Incorporate <Someone>'s patch to skip adding of a final "s" to "Nazgul" when pluralizing.
NetHack · Dec 23, 2003 · 4a2dc92 · 4a2dc92
1 parent 57b1e96
commit 4a2dc92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/doc/fixes34.4 b/doc/fixes34.4
@@ -9,6 +9,7 @@ wizard mode: avoid division by 0 crash for level teleport in the endgame if
 don't #sit on an object in a pit if you're only on the precipice
 fix message when pushing a boulder into a pool while riding
 when you're teetering on the edge of a pit you can use '>' to enter the pit
+plural of "Nazgul" is "Nazgul" not "Nazguls"
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/objnam.c b/src/objnam.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)objnam.c	3.4	2003/12/04	*/
+/*	SCCS Id: @(#)objnam.c	3.4	2003/12/22	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1354,7 +1354,8 @@ const char *oldstr;
 			!strcmp(spot-7, "shuriken") ||
 			!strcmp(spot-4, "tengu") ||
 			!strcmp(spot-4, "manes"))) ||
-	    (len >= 6 && !strcmp(spot-5, "ki-rin")) ||
+	    (len >= 6 && (!strcmp(spot-5, "ki-rin") ||
+			!strcmp(spot-5, "Nazgul"))) ||
 	    (len >= 7 && !strcmp(spot-6, "gunyoki")))
 		goto bottom;