From: cohrs <cohrs>
Date: Sun, 25 May 2003 23:21:20 +0000 (+0000)
Subject: another grammar bit
X-Git-Tag: MOVE2GIT~1952
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f61e3ceefecc6696a99b9e7dafcb37f5349660ec;p=nethack

another grammar bit
My e-mail archive shows this was originally reported as one of several
items in R871.  Clean up a hit message when wielding cream pies.
---

diff --git a/src/uhitm.c b/src/uhitm.c
index bb0454c86..7027ab05b 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -839,12 +839,16 @@ int thrown;
 					  mon->mcansee ? "" : " further");
 			    } else {
 				char *whom = mon_nam(mon);
+				char *what = The(xname(obj));
+				if (!thrown && obj->quan > 1)
+				    what = An(singular(obj, xname));
 				/* note: s_suffix returns a modifiable buffer */
 				if (haseyes(mdat)
 				    && mdat != &mons[PM_FLOATING_EYE])
-				    whom = strcat(s_suffix(whom), " face");
-				pline_The("%s splashes over %s!",
-					  xname(obj), whom);
+				    whom = strcat(strcat(s_suffix(whom), " "),
+						  mbodypart(mon, FACE));
+				pline("%s %s over %s!",
+				      what, vtense(what, "splash"), whom);
 			    }
 			    setmangry(mon);
 			    mon->mcansee = 0;