diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-18 11:37:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-18 11:37:24 +0000 |
| commit | 5c1d15b2a0ba16caafbc5f426541386776e6ad70 (patch) | |
| tree | 340d1ea4b5fb4d28b3578dbb3257eca03714b2e9 /crawl-ref/source/it_use2.cc | |
| parent | a7c16941b77fcdcc841c3edbcd0514c16ac4c2e5 (diff) | |
| download | crawl-ref-5c1d15b2a0ba16caafbc5f426541386776e6ad70.tar.gz crawl-ref-5c1d15b2a0ba16caafbc5f426541386776e6ad70.zip | |
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
Diffstat (limited to 'crawl-ref/source/it_use2.cc')
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index 3245babafb..6ca4a09a46 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -386,12 +386,18 @@ bool unwield_item(bool showMsgs) if ( unw == -1 ) return (false); + if (you.duration[DUR_BERSERKER]) + { + canned_msg(MSG_TOO_BERSERK); + return (false); + } + if (!safe_to_remove_or_wear(you.inv[unw], true)) return (false); you.equip[EQ_WEAPON] = -1; you.special_wield = SPWLD_NONE; - you.wield_change = true; + you.wield_change = true; you.m_quiver->on_weapon_changed(); item_def &item(you.inv[unw]); |