]> granicus.if.org Git - nethack/commitdiff
ox tweak
authornhmall <nhmall@nethack.org>
Fri, 16 Mar 2018 02:19:28 +0000 (22:19 -0400)
committernhmall <nhmall@nethack.org>
Fri, 16 Mar 2018 02:19:28 +0000 (22:19 -0400)
src/objnam.c

index cb11464e9c38093b7e2e88eb1750da9e631942eb..23a520233b9b6600296444b48438f44f42e7ed13 100644 (file)
@@ -2100,8 +2100,10 @@ const char *const *alt_as_is; /* another set like as_is[] */
             Strcasecpy(endstring, "s");
         return TRUE;
     }
-    /* skip "ox" -> "oxen" entry when pluralizing "<something>ox" */
-    if (to_plural && strlen(basestr) > 2 && !strcmpi(endstring - 2, "ox")) {
+    /* skip "ox" -> "oxen" entry when pluralizing "<something>ox"
+       unless it is muskox */
+    if (to_plural && strlen(basestr) > 2 && !strcmpi(endstring - 2, "ox")
+        && strcmpi(endstring - 6, "muskox")) {
         /* "fox" -> "foxes" */
         Strcasecpy(endstring, "es");
         return TRUE;