Also fix draining / torment for vampires (jarpiain).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6819 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index ca88cd2bcb..e0c03e2ed3 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2472,7 +2472,11 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell )
         // that'll mean monsters can just "know" the player is fully
         // life-protected if he has triple life protection.
         const mon_holy_type holiness = foe->holiness();
-        return (holiness == MH_UNDEAD
+        return ((holiness == MH_UNDEAD
+                 // If the claimed undead is the player, it must be
+                 // a non-vampire, or a bloodless vampire.
+                 && (foe != &you || you.is_undead != US_SEMI_UNDEAD ||
+                     you.hunger_state == HS_STARVING))
                 // Demons, but not demonspawn - demonspawn will show
                 // up as demonic for purposes of things like holy
                 // wrath, but are still (usually) susceptible to
@@ -2482,6 +2486,7 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell )
     }
 
     case SPELL_DISPEL_UNDEAD:
+        // [ds] How is dispel undead intended to interact with vampires?
         return (!foe || foe->holiness() != MH_UNDEAD);
 
     case SPELL_BACKLIGHT: