mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 16:36:41 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/deathanim'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-17 14:54:29 +02:00
commit b58a63e14e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/character.cpp
View file

@ -704,8 +704,9 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
mIdleState = CharState_Idle; mIdleState = CharState_Idle;
else else
{ {
int deathindex = mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation(); // Set the death state, but don't play it yet
playDeath(1.0f, CharacterState(CharState_Death1 + deathindex)); // We will play it in the first frame, but only if no script set the skipAnim flag
mDeathState = static_cast<CharacterState>(CharState_Death1 + mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation());
} }
} }
else else
@ -1838,6 +1839,13 @@ void CharacterController::update(float duration)
} }
else if(cls.getCreatureStats(mPtr).isDead()) else if(cls.getCreatureStats(mPtr).isDead())
{ {
// initial start of death animation for actors that started the game as dead
// not done in constructor since we need to give scripts a chance to set the mSkipAnim flag
if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty())
{
playDeath(1.f, mDeathState);
}
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f)); world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
} }