summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemname.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-28 23:07:05 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-28 23:07:05 +0000
commit5331993d1a4db1a03e36a6860edcad756213973b (patch)
treec86a58fc1ba3582d0975ff0f5c42a7151445c918 /crawl-ref/source/itemname.cc
parentfde21eb9a22782da835911ea2a0d3b70836a81a5 (diff)
downloadcrawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.tar.gz
crawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.zip
* Add icons for weapon brands, mostly borrowing from potions/wands and
with a few new creations. :) * Move tiles for unrandarts and fixedarts into artefact/ subfolders. * Move the Knife of Accuracy into the unrandart list. * Add a lab vault containing a hungry ghost (maybe should be rarer). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7680 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r--crawl-ref/source/itemname.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index b13d633ed0..a12e1c7804 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1030,11 +1030,13 @@ std::string item_def::name_aux( description_level_type desc,
}
if (!basename && !dbname && know_racial)
- // always give racial type (it does have game effects)
+ {
+ // Always give racial type (it does have game effects).
buff << racial_description_string(*this, terse);
+ }
- if (know_brand && !terse &&
- (get_weapon_brand(*this) == SPWPN_VAMPIRICISM))
+ if (know_brand && !terse
+ && get_weapon_brand(*this) == SPWPN_VAMPIRICISM)
{
buff << "vampiric ";
}