mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 06:40:40 +00:00
Code Issues Projects 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

5
apps/openmw/mwmechanics/character.cpp
View File

@ -2479,8 +2479,6 @@ namespace MWMechanics
movement.x() *= scale; movement.x() *= scale;
movement.y() *= scale; movement.y() *= scale;
// Update movement
if (movement != osg::Vec3f())
world->queueMovement(mPtr, movement); world->queueMovement(mPtr, movement);
} }
@ -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;