From 97fe1affe7f3a999b29a7ca932b99b4349b0ea46 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 26 Oct 2008 19:14:07 +0000
Subject: * Properly deactivate shields during transformations. * Fix a few
 transformation edge cases: make sure inappropriate   equipment is removed
 when untransforming e.g. if the player was   mutated during transformation or
 wielded a two-handed weapon. * Mention mulching in ammo descriptions. * Fix
 2178374: Spell descriptions for items. * FR 2183104: Get rid of training
 toggle for skills at 27.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7301 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/player.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'crawl-ref/source/player.cc')

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d79d211372..6239001df3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5939,6 +5939,9 @@ item_def *player::weapon(int /* which_attack */)
 
 item_def *player::shield()
 {
+    if (!you_tran_can_wear(EQ_SHIELD))
+        return (NULL);
+
     return slot_item(EQ_SHIELD);
 }
 
-- 
cgit v1.2.3-54-g00ecf