TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

roll back player animation picking

Browse source 
old one worked better even if it made the compiler scream
This commit is contained in:
AzaezelX 2024-07-26 10:25:02 -05:00
parent 06bcf57755
commit b5e1b32064
1 changed files with 3 additions and 3 deletions
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; mActionAnimation.callbackTripped = true;
} }
if (mActionAnimation.action == PlayerData::NullAnimation || !mActionAnimation.waitForEnd || //either no animation or not waiting till the end if ((mActionAnimation.action == PlayerData::NullAnimation) ||
((mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //or not holding that state and ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) &&
(mActionAnimation.delayTicks -= mMountPending) <= 0)) //not waiting to mount (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0)))
{ {
pickActionAnimation(); pickActionAnimation();
} }