grammar bit

     From the newsgroup recently:  cause of death on tombstone and in
log file was "slipped while mounting a saddled Stockholm" (with horse
named after city).  This fix will produce "slipped while mounting a
saddled horse called Stockholm" in that case.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index cd7b4b0d56eb2f8c658436d02c3ec046c3e137b2..993e957f9049533d8dc1b3b32594d84d5907e581 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -355,6 +355,7 @@ drop alternate weapon to terminate twoweapon combat if the alternate
 restore monster creation sanity checks to wizard mode ^G command
 prevent recoil from hurtling you through narrow areas that you wouldn't
        be able to move through intentionally
+grammar in cause of death when killed by slipping while mounting named steed
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/steed.c b/src/steed.c
index b097dd5d467e891b6db2bbb8be213b79b671dcf9..7dba5a9ba4b94d6772efc45048de5b810e6b9a4e 100644 (file)
--- a/src/steed.c
+++ b/src/steed.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)steed.c    3.4     2002/10/10      */
+/*     SCCS Id: @(#)steed.c    3.4     2003/01/10      */
 /* Copyright (c) Kevin Hugo, 1998-1999. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -319,15 +319,11 @@ mount_steed(mtmp, force)
            }
            You("slip while trying to get on %s.", mon_nam(mtmp));
 
-           /* Unfortunately we don't have a version of the monster-naming
-            * function that works well with "a" and "the" but ignores
-            * hallucination.  Fortunately, we know the monster must be saddled
-            * at this point, and that it can't have type_is_pname(), so we
-            * don't need to worry about the special cases such a function
-            * would have to consider.
-            */
-           Sprintf(buf, "slipped while mounting a saddled %s",
-                   m_monnam(mtmp));
+           Sprintf(buf, "slipped while mounting %s",
+                   /* "a saddled mumak" or "a saddled pony called Dobbin" */
+                   x_monnam(mtmp, ARTICLE_A, (char *)0,
+                       SUPPRESS_IT|SUPPRESS_INVISIBLE|SUPPRESS_HALLUCINATION,
+                            TRUE));
            losehp(rn1(5,10), buf, NO_KILLER_PREFIX);
            return (FALSE);
        }