From 5c1d15b2a0ba16caafbc5f426541386776e6ad70 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 18 Apr 2008 11:37:24 +0000 Subject: Fix 1945337: Vampires getting carnivorous/herbivorous mutations. Fix 1944345: Dropping worn/wielded items while Berserk. Fix 1945347: Drinking from fountans while Berserk. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4326 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 4a082d92fb..6cc75ce3bd 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1887,7 +1887,8 @@ bool drop_item( int item_dropped, int quant_drop, bool try_offer ) if (item_dropped == you.equip[EQ_WEAPON] && quant_drop >= you.inv[item_dropped].quantity) { - unwield_item(); + if (!unwield_item()) + return (false); canned_msg( MSG_EMPTY_HANDED ); } -- cgit v1.2.3-54-g00ecf