mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 23:15:41 +00:00
Code Issues Releases Wiki Activity

pos accum without conformity with animation bug/creature speed

Browse source
This commit is contained in:
mrcheko 2014-02-02 15:01:49 +02:00
parent 80d8aa4030
commit b85a4dd35e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwmechanics/character.cpp
View file

@ -301,8 +301,9 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
if(!mCurrentMovement.empty())
{
float vel, speedmult = 1.0f;
if(mMovementSpeed > 0.0f && (vel=mAnimation->getVelocity(mCurrentMovement)) > 1.0f)
if(mPtr.getClass().isNpc() && mMovementSpeed > 0.0f && (vel=mAnimation->getVelocity(mCurrentMovement)) > 1.0f)
speedmult = mMovementSpeed / vel;
mAnimation->play(mCurrentMovement, Priority_Movement, movegroup, false,
speedmult, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
}
@ -1120,7 +1121,13 @@ void CharacterController::update(float duration)
else //avoid z-rotating for knockdown
world->rotateObject(mPtr, rot.x, rot.y, 0.0f, true);
world->queueMovement(mPtr, vec);
// all actual movement in 3rd person controlled by animations, except for jump
// !mAnimation->hasAnimation("death1") identifies 1st person mode
if(mJumpState != JumpState_None || vec.z > 0
|| (mPtr.getRefData().getHandle() == "player" && !mAnimation->hasAnimation("death1")))
{
world->queueMovement(mPtr, vec);
}
}
movement = vec;