mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-31 19:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Revert Vampirism behavior upon death to 0.45.0-like state

Browse Source 
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
This commit is contained in:
Alexei Dobrohotov 2019-09-04 16:42:34 +03:00 committed by GitHub
parent 0caf192212
commit 2daecc633e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwmechanics/character.cpp
View File

@ -2580,11 +2580,15 @@ void CharacterController::updateMagicEffects()
if (!mPtr.getClass().isActor()) if (!mPtr.getClass().isActor())
return; return;
bool vampire = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0.0f;
mAnimation->setVampire(vampire);
float light = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Light).getMagnitude(); float light = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Light).getMagnitude();
mAnimation->setLightEffect(light); mAnimation->setLightEffect(light);
// If you're dead you don't care about whether you've started/stopped being a vampire or not
if (mPtr.getClass().getCreatureStats(mPtr).isDead())
return;
bool vampire = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0.0f;
mAnimation->setVampire(vampire);
} }
void CharacterController::setVisibility(float visibility) void CharacterController::setVisibility(float visibility)