diff options
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r-- | crawl-ref/source/itemname.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 07353d6d77..7a547d3847 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1301,18 +1301,18 @@ std::string item_def::name_aux( bool terse, bool ident ) const } else { - if (item_typ < AMU_RAGE) // rings - { - buff << ring_secondary_string(this->special / 13) - << ring_primary_string(this->special % 13) - << " ring"; - } - else // amulets + if ( jewellery_is_amulet(*this) ) { buff << amulet_secondary_string(this->special / 13) << amulet_primary_string(this->special % 13) << " amulet"; } + else // i.e., an amulet + { + buff << ring_secondary_string(this->special / 13) + << ring_primary_string(this->special % 13) + << " ring"; + } } break; |