1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00

Merge branch 'skipanim' into 'master'

Don't move characters if their animation can't move them

Closes #5593

See merge request OpenMW/openmw!490
This commit is contained in:
Alexei Dobrohotov 2020-12-28 01:25:22 +00:00
commit 45f4e69a19

View File

@ -2429,7 +2429,7 @@ void CharacterController::update(float duration, bool animationOnly)
moved.y() *= scale;
// Ensure we're moving in generally the right direction...
if(speed > 0.f)
if (speed > 0.f && moved != osg::Vec3f())
{
float l = moved.length();
if (std::abs(movement.x() - moved.x()) > std::abs(moved.x()) / 2 ||