From 72d421a98654a1d73704397dfd9a4be3177289d0 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 13 Sep 2009 21:20:59 +0000
Subject: A bug fix commit! (I didn't do one of these in a while...)

* 2856912: being turned into a pig while berserk complaining about being
           "too berserk" when unequipping the weapon
* 2849963: shields working even when melded
* 2845355: melded equipment not being affected by remove curse
* 2836148: disallow toggle_with_I if you've got a spell on 'I'


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

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

diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index 45b0605cbf..a9cbc99bd3 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -441,7 +441,8 @@ bool unwield_item(bool showMsgs)
 
     if (you.duration[DUR_BERSERKER])
     {
-        canned_msg(MSG_TOO_BERSERK);
+        if (showMsgs)
+            canned_msg(MSG_TOO_BERSERK);
         return (false);
     }
 
-- 
cgit v1.2.3-54-g00ecf