From: cohrs <cohrs>
Date: Wed, 6 Aug 2003 04:59:51 +0000 (+0000)
Subject: some "it" avoidance in killer names
X-Git-Tag: MOVE2GIT~1859
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eddeb5a7275e8dd11f5f8c9a749b09a697d6ff76;p=nethack

some "it" avoidance in killer names
<Someone> reported a couple cases where "it" could show up in killer names.
Chose his suggested fixes which result in short killer names.
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index ead0e5723..625b9c953 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -123,6 +123,7 @@ a fog cloud shouldn't pummel you with debris
 do not let an attached iron ball drag the hero through a location that the hero
 	could not move normally
 hero's appearance should change immediately after mimicing completes
+avoid some uses of "it" in killer messages
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/mhitu.c b/src/mhitu.c
index e310614f3..724bc36c7 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -1208,7 +1208,7 @@ dopois:
 			    killer_format = KILLED_BY_AN;
 			    Sprintf(buf, "%s by %s",
 				    moat ? "moat" : "pool of water",
-				    a_monnam(mtmp));
+				    an(mtmp->data->mname));
 			    killer = buf;
 			    done(DROWNING);
 			} else if(mattk->aatyp == AT_HUGS)
diff --git a/src/steed.c b/src/steed.c
index aade17d55..f09cb5da9 100644
--- a/src/steed.c
+++ b/src/steed.c
@@ -84,8 +84,8 @@ use_saddle(otmp)
 
 	    You("touch %s.", mon_nam(mtmp));
  	    if (!(poly_when_stoned(youmonst.data) && polymon(PM_STONE_GOLEM))) {
-			Sprintf(kbuf, "attempting to saddle %s", a_monnam(mtmp));
-			instapetrify(kbuf);
+		Sprintf(kbuf, "attempting to saddle %s", an(mtmp->data->mname));
+		instapetrify(kbuf);
  	    }
 	}
 	if (ptr == &mons[PM_INCUBUS] || ptr == &mons[PM_SUCCUBUS]) {