diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 13:12:08 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 13:12:08 +0000 |
| commit | 520d68077bf669ded9ec54a1811c0ce04dd68e28 (patch) | |
| tree | 7f5c5170855aec735bfc42f02869f9d51473c3a8 /crawl-ref/source/ouch.cc | |
| parent | 33ca99ed1554de6bff222448b0e8c334fcf624f1 (diff) | |
| download | crawl-ref-520d68077bf669ded9ec54a1811c0ce04dd68e28.tar.gz crawl-ref-520d68077bf669ded9ec54a1811c0ce04dd68e28.zip | |
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
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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); + } } } } |