Merge pull request #2739 from Capostrophic/vampirism

Don't reset dead non-werewolf vampires' vampire NPC type (regression #5327)
pull/2742/head
Bret Curtis 5 years ago committed by GitHub
commit 4c5d2feee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -269,6 +269,9 @@ void HeadAnimationTime::setBlinkStop(float value)
NpcAnimation::NpcType NpcAnimation::getNpcType()
{
const MWWorld::Class &cls = mPtr.getClass();
// Dead vampires should typically stay vampires.
if (mNpcType == Type_Vampire && cls.getNpcStats(mPtr).isDead() && !cls.getNpcStats(mPtr).isWerewolf())
return mNpcType;
NpcAnimation::NpcType curType = Type_Normal;
if (cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
curType = Type_Vampire;

Loading…
Cancel
Save