소스 검색

Merge pull request #1288 from Azaezel/alpha41/posePoking

pickanimation filter fix, with docs
Brian Roberts 1 년 전
부모
커밋
760c153232
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      Engine/source/T3D/player.cpp

+ 3 - 3
Engine/source/T3D/player.cpp

@@ -4014,9 +4014,9 @@ void Player::updateActionThread()
       mActionAnimation.callbackTripped = true;
       mActionAnimation.callbackTripped = true;
    }
    }
 
 
-   if ((mActionAnimation.action == PlayerData::NullAnimation) ||
-       ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) &&
-       (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0)))
+   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
    {
    {
       pickActionAnimation();
       pickActionAnimation();
    }
    }