From f965ee9d68e6b4d674897117f1711b1d439b3689 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 3 Jan 2009 19:12:35 +0000 Subject: 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 --- crawl-ref/source/player.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 1bc4a67654..66cc61224a 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -957,6 +957,10 @@ int player_equip_ego_type( int slot, int special ) // Check all armour slots: for (int i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++) { + // ... but skip ones you can't currently use! + if (!you_tran_can_wear(i)) + continue; + if (you.equip[i] != -1 && get_armour_ego_type( you.inv[you.equip[i]] ) == special) { -- cgit v1.2.3-54-g00ecf