From 2e8e0ffb7fae1ac6acf35e941153f697edcd1ac3 Mon Sep 17 00:00:00 2001 From: haranp Date: Thu, 6 Dec 2007 15:40:17 +0000 Subject: Fix 1845534 (bad naming for brands.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3013 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemname.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/itemname.cc') diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index bc56985edc..56c6dd2c6b 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -984,7 +984,11 @@ std::string item_def::name_aux( description_level_type desc, !basename && !qualname && !dbname && (ident || item_ident(*this, ISFLAG_KNOW_PLUSES)); - const bool know_brand = ident && !basename && !qualname && !dbname; + const bool know_brand = + !basename && !qualname && !dbname + && !testbits(ignore_flags, ISFLAG_KNOW_PROPERTIES) + && (ident || item_ident(*this, ISFLAG_KNOW_PROPERTIES)); + const bool know_ego = know_brand; const bool know_cosmetic = !__know_pluses && !terse & !basename -- cgit v1.2.3-54-g00ecf