diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 22:50:05 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 22:50:05 +0000 |
| commit | b791456793c967f1c484f0e3b726aadde102fc8a (patch) | |
| tree | 8ebbf1eff3334decd91a238c11cf6a268ea3249b /crawl-ref/source/describe.cc | |
| parent | 048093d6df17f7a9d57c3de999f8d2b71289bc19 (diff) | |
| download | crawl-ref-b791456793c967f1c484f0e3b726aadde102fc8a.tar.gz crawl-ref-b791456793c967f1c484f0e3b726aadde102fc8a.zip | |
Replace "is_random_artefact()" with "is_artefact()" in a few places where
this was missed, and add checks for unrandart and special unrandarts where
applicable.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10044 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index be626b3c53..5c1853e2e5 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -735,7 +735,7 @@ static std::string _describe_weapon(const item_def &item, bool verbose) int spec_ench = get_weapon_brand( item ); - if (!is_random_artefact( item ) && !verbose) + if (!is_artefact( item ) && !verbose) spec_ench = SPWPN_NORMAL; // special weapon descrip @@ -1272,7 +1272,7 @@ static std::string _describe_armour( const item_def &item, bool verbose ) } } - if (is_random_artefact( item )) + if (is_artefact( item )) { std::string rand_desc = _randart_descrip( item ); if (!rand_desc.empty()) @@ -1351,7 +1351,7 @@ static std::string _describe_jewellery( const item_def &item, bool verbose) description.reserve(200); - if ((verbose || is_random_artefact( item )) + if ((verbose || is_artefact( item )) && item_ident( item, ISFLAG_KNOW_PLUSES )) { // Explicit description of ring power (useful for randarts) @@ -1359,7 +1359,7 @@ static std::string _describe_jewellery( const item_def &item, bool verbose) // in the case that its zero, just to avoid confusion. -- bwr if (item.plus != 0 || item.sub_type == RING_SLAYING && item.plus2 != 0 - || is_random_artefact( item )) + || is_artefact( item )) { switch (item.sub_type) { @@ -1422,8 +1422,8 @@ static std::string _describe_jewellery( const item_def &item, bool verbose) } } - // Randart properties. - if (is_random_artefact( item )) + // Artefact properties. + if (is_artefact( item )) { std::string rand_desc = _randart_descrip( item ); if (!rand_desc.empty()) @@ -2243,7 +2243,7 @@ void inscribe_item(item_def &item, bool proper_prompt) // Only allow autoinscription if we don't have all the text // already. bool need_autoinscribe = false; - if (is_random_artefact(item)) + if (is_artefact(item)) { ainscrip = artefact_auto_inscription(item); if (!ainscrip.empty() |