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/player.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index d35261d001..8c265ec690 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -655,9 +655,15 @@ bool you_tran_can_wear(const item_def &item) return you_tran_can_wear(jewellery_is_amulet(item) ? EQ_AMULET : EQ_LEFT_RING); case OBJ_ARMOUR: - if (item.sub_type == ARM_CAP) + if (item.sub_type == ARM_NAGA_BARDING) + return (you.species == SP_NAGA && you_tran_can_wear(EQ_BOOTS)); + else if (item.sub_type == ARM_CENTAUR_BARDING) + return (you.species == SP_CENTAUR && you_tran_can_wear(EQ_BOOTS)); + + if (item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT) { const int transform = you.attribute[ATTR_TRANSFORMATION]; + // All but these transformations can wear hats/caps. return (transform != TRAN_BAT && transform != TRAN_AIR); } return you_tran_can_wear(get_armour_slot(item), true); -- cgit v1.2.3-54-g00ecf