TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1288 from Azaezel/alpha41/posePoking

Browse source 
pickanimation filter fix, with docs
This commit is contained in:
Brian Roberts 2024-06-15 14:30:52 -05:00 committed by GitHub
parent b2fad6e3b9 7ac714606f
commit 760c153232
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/player.cpp
View file

@ -4014,9 +4014,9 @@ void Player::updateActionThread()
mActionAnimation.callbackTripped = true;
}
if ((mActionAnimation.action == PlayerData::NullAnimation) ||
((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) &&
(!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0)))
if (mActionAnimation.action == PlayerData::NullAnimation || !mActionAnimation.waitForEnd || //either no animation or not waiting till the end
((mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //or not holding that state and
(mActionAnimation.delayTicks -= mMountPending) <= 0)) //not waiting to mount
{
pickActionAnimation();
}