From: nethack.rankin <nethack.rankin>
Date: Thu, 6 Oct 2005 03:57:15 +0000 (+0000)
Subject: vampire bit (trunk only)
X-Git-Tag: MOVE2GIT~1226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c56042a0ca40e78e0ba1e1b9cb76c8dd0fdfe23;p=nethack

vampire bit (trunk only)

     Vampires' aversion to altars is retained when they've shapeshifted
into their assorted alternate forms.
---

diff --git a/src/monmove.c b/src/monmove.c
index c757ec8b4..43cd4f7e5 100644
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -125,12 +125,13 @@ struct monst *mtmp;
 	    is_rider(mtmp->data) || mtmp->data == &mons[PM_MINOTAUR])
 		return(FALSE);
 
-	return (boolean)(sobj_at(SCR_SCARE_MONSTER, x, y)
+	return (boolean)(sobj_at(SCR_SCARE_MONSTER, x, y) ||
 #ifdef ELBERETH
-			 || sengr_at("Elbereth", x, y)
+			 sengr_at("Elbereth", x, y) ||
 #endif
-			 || (mtmp->data->mlet == S_VAMPIRE
-			     && IS_ALTAR(levl[x][y].typ)));
+			 (IS_ALTAR(levl[x][y].typ) &&
+			    (mtmp->data->mlet == S_VAMPIRE ||
+			     is_vampshifter(mtmp))));
 }
 
 /* regenerate lost hit points */