bad grammar

fix many new cases of bad grammar due to several misuses of the return
values of strncmp or is_plural

diff --git a/src/muse.c b/src/muse.c
index a945ace2bbbec0dc3c1ceffd2c80cff62c2d5aa0..a906cb19f289ba9df7162be34294952bf7914349 100644 (file)
--- 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 733a191955152a6d77f52cfae70d6d4a748fc734..af54aeffff73f8a8aff80026cf7b0e922073b2d1 100644 (file)
--- 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 d79566355298765e32429f13cec487e61ef74d65..0372af31142a15114ff0229042102c15e4259c0a 100644 (file)
--- 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;
                    }