mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-26 08:41:35 +00:00
Code Issues Releases Wiki Activity

Don't reset dead non-werewolf vampires' vampire NPC type

Browse source
This commit is contained in:
Capostrophic 2020-03-25 21:06:21 +03:00
parent 8779d261ba
commit 3e3f5d66b2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwrender/npcanimation.cpp
View file

@ -269,6 +269,9 @@ void HeadAnimationTime::setBlinkStop(float value)
NpcAnimation::NpcType NpcAnimation::getNpcType() NpcAnimation::NpcType NpcAnimation::getNpcType()
{ {
const MWWorld::Class &cls = mPtr.getClass(); 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; NpcAnimation::NpcType curType = Type_Normal;
if (cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0) if (cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
curType = Type_Vampire; curType = Type_Vampire;