diff options
Diffstat (limited to 'crawl-ref/source/libutil.cc')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 8d225b7cd3..7aa9b4ef12 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -339,10 +339,14 @@ std::string pluralise(const std::string &name, // knife -> knives return name.substr(0, name.length() - 2) + "ves"; } - else if (ends_with(name, "elf") || ends_with(name, "olf") - || ends_with(name, "arf")) + else if (ends_with(name, "ff")) { - // Elf, wolf, dwarf. + // staff -> staves + return name.substr(0, name.length() - 2) + "ves"; + } + else if (ends_with(name, "f")) + { + // elf -> elves return name.substr(0, name.length() - 1) + "ves"; } else if (ends_with(name, "mage")) @@ -373,10 +377,6 @@ std::string pluralise(const std::string &name, // efreet -> efreeti. Not sure this is correct. return name + "i"; } - else if (ends_with(name, "staff")) - { - return name.substr(0, name.length() - 2) + "ves"; - } return name + "s"; } |