From 6ff6324e1225d17c1911efda0853ae032546cb91 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 11 Jan 2009 17:10:51 +0000 Subject: 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 --- crawl-ref/source/transfor.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/transfor.cc') diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 678b7b49ed..2737cdecf5 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -177,8 +177,11 @@ static bool _unmeld_equipment(std::set melded) break; case EQ_BOOTS: - if (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS]) + if (you.inv[arm].sub_type == ARM_BOOTS // i.e. not barding + && (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS])) + { force_remove = true; + } break; case EQ_SHIELD: -- cgit v1.2.3-54-g00ecf