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/misc.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/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index f5be8ee92e..719e2fea0d 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -741,6 +741,7 @@ bool maybe_coagulate_blood_potions_inv(item_def &blood) return (true); } +// Removes the oldest timer of a stack of blood potions. // Mostly used for (q)uaff, (f)ire, and Evaporate. long remove_oldest_blood_potion(item_def &stack) { @@ -759,7 +760,7 @@ long remove_oldest_blood_potion(item_def &stack) timer.pop_back(); // The quantity will be decreased elsewhere. - return val; + return (val); } // Used whenever copies of blood potions have to be cleaned up. |