mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-16 09:04:38 +00:00
proper formulation
This commit is contained in:
parent
61978fa4da
commit
7ac714606f
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 || //no animation
|
if (mActionAnimation.action == PlayerData::NullAnimation || !mActionAnimation.waitForEnd || //either no animation or not waiting till the end
|
||||||
((!mActionAnimation.waitForEnd || (mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //either not waiting till the end, or not holding that state
|
((mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //or not holding that state and
|
||||||
(mActionAnimation.delayTicks -= mMountPending) <= 0))) //not waiting to mount
|
(mActionAnimation.delayTicks -= mMountPending) <= 0)) //not waiting to mount
|
||||||
{
|
{
|
||||||
pickActionAnimation();
|
pickActionAnimation();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue