AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

clang'd

Browse Source
This commit is contained in:
Mads Buvik Sandvei 2023-10-25 18:59:05 +02:00
parent 8792e76f5d
commit 24890a729b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,16 +1855,16 @@ namespace MWMechanics
if (mAnimQueue.empty()) if (mAnimQueue.empty())
return; return;
if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false) if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
{ {
if (mAnimQueue.size() > 1) if (mAnimQueue.size() > 1)
{ {
mAnimation->disable(mAnimQueue.front().mGroup); mAnimation->disable(mAnimQueue.front().mGroup);
mAnimQueue.pop_front(); mAnimQueue.pop_front();
bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle"); bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle");
mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All, mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All, false,
false, 1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback); 1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
} }
else if (mAnimQueue.front().mLoopCount > 1 && mAnimQueue.front().mPersist) else if (mAnimQueue.front().mLoopCount > 1 && mAnimQueue.front().mPersist)
{ {
@ -1881,7 +1881,7 @@ namespace MWMechanics
mAnimation->disable(mAnimQueue.front().mGroup); mAnimation->disable(mAnimQueue.front().mGroup);
mAnimQueue.pop_front(); mAnimQueue.pop_front();
} }
} }
else else
{ {
mAnimQueue.front().mLoopCount = mAnimation->getCurrentLoopCount(mAnimQueue.front().mGroup); mAnimQueue.front().mLoopCount = mAnimation->getCurrentLoopCount(mAnimQueue.front().mGroup);