diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-11 17:10:51 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-11 17:10:51 +0000 |
| commit | 6ff6324e1225d17c1911efda0853ae032546cb91 (patch) | |
| tree | 959c7c66cca51b742fe489dca270ad307c6f5424 /crawl-ref/source/itemname.cc | |
| parent | f6e92f4f5ed27ac7309f7382b4f04395bf1ad07e (diff) | |
| download | crawl-ref-6ff6324e1225d17c1911efda0853ae032546cb91.tar.gz crawl-ref-6ff6324e1225d17c1911efda0853ae032546cb91.zip | |
Fix 2496474: Bardings melding into centaurs.
Fix 2496520: Quivered weapons getting displayed as melded.
Also, summoned monsters can no longer be affected by vampiric draining
(spell or brand, vampire bite was already disallowed).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8413 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index ee55efb22b..38c5eb159d 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -232,8 +232,11 @@ std::string item_def::name(description_level_type descrip, ASSERT( this->link != -1 ); equipped = true; - if (!you_tran_can_wear(*this) && you.equip[EQ_WEAPON] != this->link) + if (!you_tran_can_wear(*this) && you.equip[EQ_WEAPON] != this->link + && this->link != you.m_quiver->get_fire_item()) + { buff << " (melded)"; + } else if (this->link == you.equip[EQ_WEAPON]) { if (this->base_type == OBJ_WEAPONS || item_is_staff(*this)) |