summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 14:05:26 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 14:05:26 +0000
commit4bddff39d6767838f019f79d069591020223389c (patch)
treeb8869ace0b3417b93b7d5afc0c3cac6af05b9fd9 /crawl-ref/source/delay.cc
parent4626c89fde4187298219d76253415b58347b199c (diff)
downloadcrawl-ref-4bddff39d6767838f019f79d069591020223389c.tar.gz
crawl-ref-4bddff39d6767838f019f79d069591020223389c.zip
* Another magic mapping fix in cooperation with zebez. Thanks! :)
* Don't make Detect creatures "detect" monsters you can currently see. * Replace rock stair tiles with Eino's escape hatch tiles. * Update change log once again. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10447 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index e7d4200907..dcc2498d6c 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -829,8 +829,15 @@ void handle_delay()
// XXX: need to handle passwall when monster digs -- bwr
if (delay.type == DELAY_FEED_VAMPIRE)
{
+ // Vampires stop feeding if ...
+ // * engorged ("alive")
+ // * bat form runs out due to becoming full
+ // * corpse becomes poisonous as the Vampire loses poison resistance
if (you.hunger_state == HS_ENGORGED
- || you.hunger_state > HS_SATIATED && player_in_bat_form())
+ || you.hunger_state > HS_SATIATED && player_in_bat_form()
+ || you.hunger_state >= HS_SATIATED
+ && is_valid_item(mitm[delay.parm1])
+ && is_poisonous(mitm[delay.parm1]))
{
// Messages handled in _food_change() in food.cc.
stop_delay();