From 3c4a60908487170145e20d7a7e298496bef1666f Mon Sep 17 00:00:00 2001 From: zelgadis Date: Fri, 16 Jan 2009 07:05:32 +0000 Subject: 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 --- crawl-ref/source/items.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'crawl-ref/source/items.h') diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index 1770c8032f..8a0c9bd397 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -47,6 +47,8 @@ bool is_stackable_item( const item_def &item ); bool items_similar( const item_def &item1, const item_def &item2 ); bool items_stack( const item_def &item1, const item_def &item2, bool force_merge = false ); +void merge_item_stacks(item_def &source, item_def &dest, + int quant = -1); item_def find_item_type(object_class_type base_type, std::string name); item_def *find_floor_item(object_class_type cls, int sub_type); -- cgit v1.2.3-54-g00ecf