瀏覽代碼

Merge pull request #1296 from Azaezel/alpha41/revertReformulation

roll back player animation picking
Areloch 1 年之前
父節點
當前提交
c0dec83a21
共有 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 || //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();
       pickActionAnimation();
    }
    }