From 3423bbab5a0f024eeafffe6b8260c8c088647db1 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 5 May 2008 08:39:20 +0000 Subject: First attempt at making vampire feeding interruptible. It doesn't work yet (I had "You stop feeding" followed by "You continue feeding" including full effects), but it's probably better to commit now anyway. Known potions of blood or porridge cannot be quaffed when engorged (alive). Also clean up blood potions check. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4871 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells3.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'crawl-ref/source/spells3.cc') diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index b5fb8a8bea..36dd8baf38 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -342,9 +342,7 @@ void sublimation(int power) dec_inv_item_quantity( wielded, 1 ); } - else if (you.inv[wielded].base_type == OBJ_POTIONS - && (you.inv[wielded].sub_type == POT_BLOOD - || you.inv[wielded].sub_type == POT_BLOOD_COAGULATED)) + else if (is_blood_potion(you.inv[wielded])) { mprf("The blood within %s frothes and boils.", you.inv[wielded].quantity == 1 ? "the flask you are holding" -- cgit v1.2.3-54-g00ecf