mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 22:53:53 +00:00
Code Issues Releases Wiki Activity

Do not interrupt scripted animations

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-11 17:18:51 +04:00
parent ae87e0d3fc
commit e234dd2a36
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -561,6 +561,14 @@ void CharacterController::refreshIdleAnims(const WeaponInfo* weap, CharacterStat
void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force) void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
{ {
// If the current animation is persistent, do not touch it
if (!mAnimQueue.empty())
{
AnimationQueueEntry& first = mAnimQueue.front();
if (first.mPersist)
return;
}
if (mPtr.getClass().isActor()) if (mPtr.getClass().isActor())
refreshHitRecoilAnims(); refreshHitRecoilAnims();
@ -2135,6 +2143,14 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
if(!mAnimation || !mAnimation->hasAnimation(groupname)) if(!mAnimation || !mAnimation->hasAnimation(groupname))
return false; return false;
// We should not interrupt persistent animations by non-persistent ones
if (!mAnimQueue.empty())
{
AnimationQueueEntry& first = mAnimQueue.front();
if (first.mPersist && !persist)
return false;
}
// If this animation is a looped animation (has a "loop start" key) that is already playing // If this animation is a looped animation (has a "loop start" key) that is already playing
// and has not yet reached the end of the loop, allow it to continue animating with its existing loop count // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count
// and remove any other animations that were queued. // and remove any other animations that were queued.
@ -2199,9 +2215,21 @@ bool CharacterController::isAnimPlaying(const std::string &groupName)
void CharacterController::clearAnimQueue() void CharacterController::clearAnimQueue()
{ {
if(!mAnimQueue.empty()) // Do not interrupt scripted animations
mAnimation->disable(mAnimQueue.front().mGroup); if (!mAnimQueue.empty())
mAnimQueue.clear(); {
AnimationQueueEntry& first = mAnimQueue.front();
if (!first.mPersist)
mAnimation->disable(mAnimQueue.front().mGroup);
}
for (AnimationQueue::iterator it = mAnimQueue.begin(); it != mAnimQueue.end();)
{
if (!it->mPersist)
it = mAnimQueue.erase(it);
else
++it;
}
} }
void CharacterController::forceStateUpdate() void CharacterController::forceStateUpdate()