From 3983318242b473d670b482c4095d21de2293cdd9 Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Sun, 10 Feb 2002 19:02:46 +0000
Subject: [PATCH] bad grammar fix many new cases of bad grammar due to several
 misuses of the return values of strncmp or is_plural

---
 src/muse.c   | 2 +-
 src/objnam.c | 8 ++++----
 src/weapon.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/muse.c b/src/muse.c
index a945ace2b..a906cb19f 100644
--- a/src/muse.c
+++ b/src/muse.c
@@ -1803,7 +1803,7 @@ skipmsg:
 			  The_whip, the_weapon);
 		    if (welded(obj)) {
 			pline("%s welded to your %s%c",
-			      is_plural(obj) ? "It is" : "They are",
+			      !is_plural(obj) ? "It is" : "They are",
 			      hand, !obj->bknown ? '!' : '.');
 			/* obj->bknown = 1; */ /* welded() takes care of this */
 			where_to = 0;
diff --git a/src/objnam.c b/src/objnam.c
index 733a19195..af54aefff 100644
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1030,10 +1030,10 @@ register const char *verb;
 	     * Guess at a few other special cases that makeplural creates.
 	     */
 	    if ((*spot == 's' && spot != subj && *(spot-1) != 'u') ||
-		((spot - subj) >= 4 && strncmp(spot-3, "eeth", 4)) ||
-		((spot - subj) >= 3 && strncmp(spot-3, "feet", 4)) ||
-		((spot - subj) >= 2 && strncmp(spot-1, "ia", 2)) ||
-		((spot - subj) >= 2 && strncmp(spot-1, "ae", 2))) {
+		((spot - subj) >= 4 && !strncmp(spot-3, "eeth", 4)) ||
+		((spot - subj) >= 3 && !strncmp(spot-3, "feet", 4)) ||
+		((spot - subj) >= 2 && !strncmp(spot-1, "ia", 2)) ||
+		((spot - subj) >= 2 && !strncmp(spot-1, "ae", 2))) {
 		Strcpy(buf, verb);
 		return buf;
 	    }
diff --git a/src/weapon.c b/src/weapon.c
index d79566355..0372af311 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -650,8 +650,8 @@ register struct monst *mon;
 		    pline("%s wields %s!", Monnam(mon), doname(obj));
 		    if (obj->cursed && obj->otyp != CORPSE) {
 			pline("%s %s to %s %s!",
-			    The(xname(obj)),
-			    is_plural(obj) ? "welds itself" : "weld themselves",
+			    Tobjnam(obj, "weld"),
+			    is_plural(obj) ? "themselves" : "itself",
 			    s_suffix(mon_nam(mon)), mbodypart(mon,HAND));
 			obj->bknown = 1;
 		    }