summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-20 23:07:57 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-20 23:07:57 +0000
commit79b18d33d39ce5d1b467c31f2d2db6abf86a3ba2 (patch)
tree0403b512bdd73c02f36ebcaf131645ce6651dcf6
parent189adb60c4c707b1c38cf3505cc76fc6d353e3ba (diff)
downloadcrawl-ref-79b18d33d39ce5d1b467c31f2d2db6abf86a3ba2.tar.gz
crawl-ref-79b18d33d39ce5d1b467c31f2d2db6abf86a3ba2.zip
Refixed uncursed status fix - uncursed status needn't be shown for rings with
known pluses (slaying, etc.); it's now shown if the ring isn't eligible for pluses, or if it *is* eligible for pluses, but the pluses are unknown. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@56 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/itemname.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index cedfe931bb..f8862888a0 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1062,8 +1062,12 @@ static char item_name_2( const item_def &item, char buff[ITEMNAME_SIZE],
{
if (item_cursed( item ))
strncat(buff, "cursed ", ITEMNAME_SIZE );
- else if (Options.show_uncursed)
+ else if (Options.show_uncursed
+ && (!ring_has_pluses(item)
+ || !item_ident(item, ISFLAG_KNOW_PLUSES)))
+ {
strncat(buff, "uncursed ", ITEMNAME_SIZE );
+ }
}
if (is_random_artefact( item ))