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

fix #H4457 - grammar nitpick

Browse Source 
"Your pair of speed boots glow silver for a moment." should be
"Your pair of speed boots glows silver for a moment.".  The fix
reverses a post-3.6.0 change to is_plural().  Also, add new
pair_of() to test for object formatted as "pair of Bars".  For verb
usage, that's definitely singular, but for pronoun usage, sometimes
plural seems better (although it might actually be incorrect).

I fixed up the formatting of a block comment in obj.h, but it is
still a candidate for tab cleanup.
This commit is contained in:
PatR
2016-07-30 01:19:44 -07:00
parent d466dc3742
commit 6632c380f3
7 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/objnam.c
View File

@@ -2763,24 +2763,25 @@ struct obj *no_wish;
}
/*
Skip over "pair of ", "pairs of", "set of" and "sets of".
Accept "3 pair of boots" as well as "3 pairs of boots". It is valid
English either way. See makeplural() for more on pair/pairs.
We should only double count if the object in question is not
referred to as a "pair of". E.g. We should double if the player
types "pair of spears", but not if the player types "pair of
lenses". Luckily (?) all objects that are referred to as pairs
-- boots, gloves, and lenses -- are also not mergable, so cnt is
ignored anyway.
*/
* Skip over "pair of ", "pairs of", "set of" and "sets of".
*
* Accept "3 pair of boots" as well as "3 pairs of boots". It is
* valid English either way. See makeplural() for more on pair/pairs.
*
* We should only double count if the object in question is not
* referred to as a "pair of". E.g. We should double if the player
* types "pair of spears", but not if the player types "pair of
* lenses". Luckily (?) all objects that are referred to as pairs
* -- boots, gloves, and lenses -- are also not mergable, so cnt is
* ignored anyway.
*/
if (!strncmpi(bp, "pair of ", 8)) {
bp += 8;
cnt *= 2;
} else if (cnt > 1 && !strncmpi(bp, "pairs of ", 9)) {
} else if (!strncmpi(bp, "pairs of ", 9)) {
bp += 9;
cnt *= 2;
if (cnt > 1)
cnt *= 2;
} else if (!strncmpi(bp, "set of ", 7)) {
bp += 7;
} else if (!strncmpi(bp, "sets of ", 8)) {