summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemname.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r--crawl-ref/source/itemname.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 1b6688c1cb..619b3e658e 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -203,7 +203,7 @@ std::string item_def::name(description_level_type descrip,
ASSERT( this->link != -1 );
equipped = true;
- if (!you_tran_can_wear(*this))
+ if (!you_tran_can_wear(*this) && you.equip[EQ_WEAPON] != this->link)
buff << " (melded)";
else if (this->link == you.equip[EQ_WEAPON])
{