summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/libutil.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/libutil.cc')
-rw-r--r--crawl-ref/source/libutil.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index 0a985a5d0a..cc7066aedf 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -354,12 +354,12 @@ std::string pluralise(const std::string &name,
}
else if (ends_with(name, "staff"))
{
- // staff -> staves, but not hippogriff -> hippogrives.
+ // staff -> staves
return name.substr(0, name.length() - 2) + "ves";
}
- else if (ends_with(name, "f"))
+ else if (ends_with(name, "f") && !ends_with(name, "ff"))
{
- // elf -> elves
+ // elf -> elves, but not hippogriff -> hippogrives.
return name.substr(0, name.length() - 1) + "ves";
}
else if (ends_with(name, "mage"))