delete accidentally commited files

7 years ago · 43c49e2f31
parent 1b184d8716
commit 43c49e2f31
2 changed files with 0 additions and 2510 deletions
--- a/apps/openmw/mwmechanics/character.cpp.orig
+++ b/apps/openmw/mwmechanics/character.cpp.orig
--- a/apps/openmw/mwmechanics/character.cpp.rej
+++ b/apps/openmw/mwmechanics/character.cpp.rej
@ -1,46 +0,0 @@
--- apps/openmw/mwmechanics/character.cpp
-+++ apps/openmw/mwmechanics/character.cpp
-@@ -372,29 +372,28 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
-             }
-         }
- 
-        if(mJumpState == JumpState_InAir)
-+        if (!mCurrentJump.empty())
-         {
-             mAnimation->disable(mCurrentJump);
-            mCurrentJump = jumpAnimName;
-            if (mAnimation->hasAnimation("jump"))
-                mAnimation->play(mCurrentJump, Priority_Jump, jumpmask, false,
-+            mCurrentJump.clear();
-+        }
-+
-+        if(mJumpState == JumpState_InAir)
-+        {
-+            if (mAnimation->hasAnimation(jumpAnimName))
-+            {
-+                mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false,
-                              1.0f, (startAtLoop?"loop start":"start"), "stop", 0.0f, ~0ul);
-+                mCurrentJump = jumpAnimName;
-+            }
-         }
-         else if (mJumpState == JumpState_Landing)
-         {
-            if (startAtLoop)
-                mAnimation->disable(mCurrentJump);
-
-            if (mAnimation->hasAnimation("jump"))
-+            if (mAnimation->hasAnimation(jumpAnimName))
-+            {
-                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
-                              1.0f, "loop stop", "stop", 0.0f, 0);
-        }
-        else    // JumpState_None
-        {
-            if (mCurrentJump.length() > 0)
-            {
-                mAnimation->disable(mCurrentJump);
-                mCurrentJump.clear();
-+                mCurrentJump = jumpAnimName;
-             }
-         }
-     }