Преглед на файлове

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;
    }
 
-   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();
    }