From b5e1b32064108b71b1bcefa97607918ff2886fa7 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 26 Jul 2024 10:25:02 -0500 Subject: [PATCH] roll back player animation picking old one worked better even if it made the compiler scream --- Engine/source/T3D/player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp index 7c0fd1aca..34da962e6 100644 --- a/Engine/source/T3D/player.cpp +++ b/Engine/source/T3D/player.cpp @@ -4014,9 +4014,9 @@ void Player::updateActionThread() mActionAnimation.callbackTripped = true; } - 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 + if ((mActionAnimation.action == PlayerData::NullAnimation) || + ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) && + (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0))) { pickActionAnimation(); }