From f9c396e0eae7037d0217b79cbbb5fe3878853a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.com>
Date: Sat, 28 Oct 2017 15:48:07 +0200
Subject: [PATCH] stop landing animation when turning

---
 apps/openmw/mwmechanics/character.cpp | 6 ++++++
 apps/openmw/mwmechanics/character.hpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 03acfdaf2..dc910c577 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -372,6 +372,9 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
+        if (jumpAnimName.length() > 0)
+            mJumpAnimName = jumpAnimName;
+
         if(mJumpState == JumpState_InAir)
         {
             mAnimation->disable(mCurrentJump);
@@ -555,6 +558,9 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (mPtr.getClass().isActor())
         refreshHitRecoilAnims();
 
+    if (isTurning() && mJumpState != JumpState_InAir)
+        mAnimation->disable(mJumpAnimName);
+
     const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
     if (!mPtr.getClass().isBipedal(mPtr))
         weap = sWeaponTypeListEnd;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index af90c18b8..c03702ef2 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -184,6 +184,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     JumpingState mJumpState;
     std::string mCurrentJump;
+    std::string mJumpAnimName;
 
     WeaponType mWeaponType;
     std::string mCurrentWeapon;