From 520d68077bf669ded9ec54a1811c0ce04dd68e28 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 18 Jul 2008 13:12:08 +0000 Subject: Extend Enne's blood potion destruction fix to potions on the floor. Fix monsters "upgrading" their ammunition even if its brand cancels out with the launcher. Also make sure monsters aren't generated with launcher/ammo with opposing brands. Fix 2021310: no longer disallow blowgun acquirement. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6601 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/ouch.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/ouch.cc') diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index a0415148a0..4e0df5df79 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -559,7 +559,11 @@ void expose_items_to_element(beam_type flavour, int x, int y, int strength) if (x_chance_in_y(strength, 100)) { num_dest++; - dec_mitm_item_quantity(si->index(), 1); + if (!dec_mitm_item_quantity(si->index(), 1) + && is_blood_potion(*si)) + { + remove_oldest_blood_potion(*si); + } } } } -- cgit v1.2.3-54-g00ecf