From d90d42364935634477497d3397f8a46ad7a5ccf3 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 8 Dec 2008 14:36:42 +0000 Subject: * Add sharks. They go into a battle frenzy if they smell blood. * Make harpies actually appear in packs. (Oops...) * Properly pluralise hippogriffs as such. * Regard butcher swap prompt as safe and default to 'n'. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7784 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/libutil.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/libutil.cc') 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")) -- cgit v1.2.3-54-g00ecf