diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 19:12:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 19:12:35 +0000 |
| commit | f965ee9d68e6b4d674897117f1711b1d439b3689 (patch) | |
| tree | 76dee79218cb856a4d0dc83892172830c9e5e99e /crawl-ref/source/itemname.cc | |
| parent | a6ba15c18bfc465daecb5390ad73f0a0f3df940b (diff) | |
| download | crawl-ref-f965ee9d68e6b4d674897117f1711b1d439b3689.tar.gz crawl-ref-f965ee9d68e6b4d674897117f1711b1d439b3689.zip | |
Fix 2483722: EQ_ALL_ARMOUR not skipping melded armour.
Fix 2483708: Transformations regarding wielded non-weapons as meldable.
Fix 2483528: Disallow randart book names like "Sif Muna's Lost Book of
Boris"
Fix 2483332: Silly logic error that only offered fully recharged wands
for recharging
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8175 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 2 |
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]) { |