mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 20:11:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pushthefatman' into 'master'

Browse source 
Animation regression fixes

See merge request OpenMW/openmw!4001
This commit is contained in:
psi29a 2024-04-12 15:02:39 +00:00
commit bdbbe34afc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2479,9 +2479,7 @@ namespace MWMechanics
movement.x() *= scale; movement.x() *= scale;
movement.y() *= scale; movement.y() *= scale;
// Update movement world->queueMovement(mPtr, movement);
if (movement != osg::Vec3f())
world->queueMovement(mPtr, movement);
} }
mSkipAnim = false; mSkipAnim = false;
@ -2698,6 +2696,9 @@ namespace MWMechanics
bool CharacterController::isMovementAnimationControlled() const bool CharacterController::isMovementAnimationControlled() const
{ {
if (mHitState != CharState_None)
return true;
if (Settings::game().mPlayerMovementIgnoresAnimation && mPtr == getPlayer()) if (Settings::game().mPlayerMovementIgnoresAnimation && mPtr == getPlayer())
return false; return false;