From 61978fa4da95adbd1b261ecac24d6935b372dde8 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 11 Jun 2024 15:21:24 -0500 Subject: [PATCH] pickanimation filter fix, with docs sorts the order of operations flaws clang was complaining about, with explainations on why --- 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 f2e54900a..623b5f716 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 || mActionAnimation.atEnd) && - (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0))) + if (mActionAnimation.action == PlayerData::NullAnimation || //no animation + ((!mActionAnimation.waitForEnd || (mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //either not waiting till the end, or not holding that state + (mActionAnimation.delayTicks -= mMountPending) <= 0))) //not waiting to mount { pickActionAnimation(); }