summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.h
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-16 07:05:32 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-16 07:05:32 +0000
commit3c4a60908487170145e20d7a7e298496bef1666f (patch)
tree3282b642e80dfa2b1bc208e54692ac4bc084b00f /crawl-ref/source/misc.h
parentc4968d0089d5c0d165b38b8f3c3e3f7983d0e191 (diff)
downloadcrawl-ref-3c4a60908487170145e20d7a7e298496bef1666f.tar.gz
crawl-ref-3c4a60908487170145e20d7a7e298496bef1666f.zip
Fix bug #2510110: blood potions coagulating while in a monster's inventory
was causing crashes. Get rid of drop_blood_potions_stack() and pick_up_blood_potions_stack(), replace with the more general merge_blood_potion_stacks() and merge_item_stacks(). When creating blood potions via debug command you can now specify how many turns away from coagulating/rotting it should be. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8471 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.h')
-rw-r--r--crawl-ref/source/misc.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 77ba1e643f..ec3804ea30 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -33,9 +33,7 @@ void maybe_coagulate_blood_potions_floor( int obj );
bool maybe_coagulate_blood_potions_inv( item_def &blood );
long remove_oldest_blood_potion( item_def &stack );
void remove_newest_blood_potion( item_def &stack, int quant = -1 );
-void drop_blood_potions_stack( item_def &stack, int quant,
- const coord_def& p = you.pos() );
-void pick_up_blood_potions_stack( item_def &stack, int quant );
+void merge_blood_potion_stacks(item_def &source, item_def &dest, int quant);
bool can_bottle_blood_from_corpse( int mons_type );
int num_blood_potions_from_corpse( int mons_class, int chunk_type = -1 );