mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
pickanimation filter fix, with docs
sorts the order of operations flaws clang was complaining about, with explainations on why
This commit is contained in:
parent
3fbd3119a6
commit
61978fa4da
1 changed files with 3 additions and 3 deletions
|
|
@ -4014,9 +4014,9 @@ void Player::updateActionThread()
|
||||||
mActionAnimation.callbackTripped = true;
|
mActionAnimation.callbackTripped = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((mActionAnimation.action == PlayerData::NullAnimation) ||
|
if (mActionAnimation.action == PlayerData::NullAnimation || //no animation
|
||||||
((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) &&
|
((!mActionAnimation.waitForEnd || (mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //either not waiting till the end, or not holding that state
|
||||||
(!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0)))
|
(mActionAnimation.delayTicks -= mMountPending) <= 0))) //not waiting to mount
|
||||||
{
|
{
|
||||||
pickActionAnimation();
|
pickActionAnimation();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue