From 7bc512974f2d2d663c6813cd3d55de337b7c1858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.com>
Date: Mon, 30 Oct 2017 15:26:38 +0100
Subject: [PATCH] use mcurrentjump instead of custom attrib

---
 apps/openmw/mwmechanics/character.cpp | 12 +++++-------
 apps/openmw/mwmechanics/character.hpp |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 83c7ce844..a2e07fc5c 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -372,9 +372,6 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
-        if (jumpAnimName.length() > 0)
-            mJumpAnimName = jumpAnimName;
-
         if(mJumpState == JumpState_InAir)
         {
             mAnimation->disable(mCurrentJump);
@@ -385,8 +382,9 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
         }
         else
         {
-            mAnimation->disable(mCurrentJump);
-            mCurrentJump.clear();
+            if (startAtLoop) 
+                mAnimation->disable(mCurrentJump);
+
             if (mAnimation->hasAnimation("jump"))
                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
                              1.0f, "loop stop", "stop", 0.0f, 0);
@@ -1882,12 +1880,12 @@ void CharacterController::update(float duration)
                 if(rot.z() > 0.0f)
                 {
                     movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
-                    mAnimation->disable(mJumpAnimName);
+                    mAnimation->disable(mCurrentJump);
                 }
                 else if(rot.z() < 0.0f)
                 {
                     movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
-                    mAnimation->disable(mJumpAnimName);
+                    mAnimation->disable(mCurrentJump);
                 }
             }
         }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index c03702ef2..af90c18b8 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -184,7 +184,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     JumpingState mJumpState;
     std::string mCurrentJump;
-    std::string mJumpAnimName;
 
     WeaponType mWeaponType;
     std::string mCurrentWeapon;