diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-02 12:40:44 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-02 12:40:44 +0000 |
| commit | 0d2fd7a12bdc1fba93f2ee1cb5b35abad877ade5 (patch) | |
| tree | dd7bb323a3ceb796a00450627352949e9ff7a5f6 /crawl-ref/source/itemname.cc | |
| parent | b367d7d62fb29d7938f260999c634c5f11fa4cc8 (diff) | |
| download | crawl-ref-0d2fd7a12bdc1fba93f2ee1cb5b35abad877ade5.tar.gz crawl-ref-0d2fd7a12bdc1fba93f2ee1cb5b35abad877ade5.zip | |
Implemented patch 1773718 (improved wizard commands) and
patch 1783003 (ímproved menu sorting), both by zelgadis.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2041 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 2437217550..1237d50d04 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1265,6 +1265,16 @@ std::string item_def::name_aux( description_level_type desc, break; case OBJ_JEWELLERY: + if (basename) + { + if ( jewellery_is_amulet(*this) ) + buff << " amulet"; + else // i.e., an amulet + buff << " ring"; + + break; + } + // not using {tried} here because there are some confusing // issues to work out with how we want to handle jewellery // artefacts and base type id. -- bwr @@ -1282,7 +1292,7 @@ std::string item_def::name_aux( description_level_type desc, } } - if (is_random_artefact( *this ) && !basename) + if (is_random_artefact( *this )) { buff << randart_jewellery_name(*this); break; |