diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 14:37:25 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 14:37:25 +0000 |
| commit | 9f6d46081c7ab1d1d56a5e145ccfad9765cf35da (patch) | |
| tree | 9b1013f426eadd06df47bb286e7584f17854e180 /crawl-ref/source/libutil.cc | |
| parent | 0a09c6dad3c2cb52bb69462bbcf517a7fef850f7 (diff) | |
| download | crawl-ref-9f6d46081c7ab1d1d56a5e145ccfad9765cf35da.tar.gz crawl-ref-9f6d46081c7ab1d1d56a5e145ccfad9765cf35da.zip | |
Apply trunk r6496 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6497 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libutil.cc')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index dc0d1bfd5c..e9b9c1193f 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -339,9 +339,10 @@ 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")) + else if (ends_with(name, "elf") || ends_with(name, "olf") + || ends_with(name, "arf")) { - // Elf, wolf. Dwarfs can stay dwarfs, if there were dwarfs. + // Elf, wolf, dwarf. return name.substr(0, name.length() - 1) + "ves"; } else if (ends_with(name, "mage")) |