nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

bad grammar

Browse Source 
fix many new cases of bad grammar due to several misuses of the return
values of strncmp or is_plural
This commit is contained in:
cohrs
2002-02-10 19:02:46 +00:00
parent e565276030
commit 3983318242
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/muse.c
+1 -1
View File
@@ -1803,7 +1803,7 @@ skipmsg:
The_whip, the_weapon); The_whip, the_weapon);
if (welded(obj)) { if (welded(obj)) {
pline("%s welded to your %s%c", pline("%s welded to your %s%c",
is_plural(obj) ? "It is" : "They are", !is_plural(obj) ? "It is" : "They are",
hand, !obj->bknown ? '!' : '.'); hand, !obj->bknown ? '!' : '.');
/* obj->bknown = 1; */ /* welded() takes care of this */ /* obj->bknown = 1; */ /* welded() takes care of this */
where_to = 0; where_to = 0;
src/objnam.c
+4 -4
View File
@@ -1030,10 +1030,10 @@ register const char *verb;
* Guess at a few other special cases that makeplural creates. * Guess at a few other special cases that makeplural creates.
*/ */
if ((*spot == 's' && spot != subj && *(spot-1) != 'u') || if ((*spot == 's' && spot != subj && *(spot-1) != 'u') ||
((spot - subj) >= 4 && strncmp(spot-3, "eeth", 4)) || ((spot - subj) >= 4 && !strncmp(spot-3, "eeth", 4)) ||
((spot - subj) >= 3 && strncmp(spot-3, "feet", 4)) || ((spot - subj) >= 3 && !strncmp(spot-3, "feet", 4)) ||
((spot - subj) >= 2 && strncmp(spot-1, "ia", 2)) || ((spot - subj) >= 2 && !strncmp(spot-1, "ia", 2)) ||
((spot - subj) >= 2 && strncmp(spot-1, "ae", 2))) { ((spot - subj) >= 2 && !strncmp(spot-1, "ae", 2))) {
Strcpy(buf, verb); Strcpy(buf, verb);
return buf; return buf;
} }
src/weapon.c
+2 -2
View File
@@ -650,8 +650,8 @@ register struct monst *mon;
pline("%s wields %s!", Monnam(mon), doname(obj)); pline("%s wields %s!", Monnam(mon), doname(obj));
if (obj->cursed && obj->otyp != CORPSE) { if (obj->cursed && obj->otyp != CORPSE) {
pline("%s %s to %s %s!", pline("%s %s to %s %s!",
The(xname(obj)), Tobjnam(obj, "weld"),
is_plural(obj) ? "welds itself" : "weld themselves", is_plural(obj) ? "themselves" : "itself",
s_suffix(mon_nam(mon)), mbodypart(mon,HAND)); s_suffix(mon_nam(mon)), mbodypart(mon,HAND));
obj->bknown = 1; obj->bknown = 1;
} }