diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 14:36:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 14:36:42 +0000 |
| commit | d90d42364935634477497d3397f8a46ad7a5ccf3 (patch) | |
| tree | 05e068057f95893a9966d6a33ccea131cdc3fa53 /crawl-ref/source/libutil.cc | |
| parent | 596223a14698390d7eb422e80939f460a5f32a2f (diff) | |
| download | crawl-ref-d90d42364935634477497d3397f8a46ad7a5ccf3.tar.gz crawl-ref-d90d42364935634477497d3397f8a46ad7a5ccf3.zip | |
* 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
Diffstat (limited to 'crawl-ref/source/libutil.cc')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 6 |
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")) |