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

Merge branch 'fix_give_way' into 'master'

Browse source 
Use full speed in the "NPCs give way" maneuver.

See merge request OpenMW/openmw!348
This commit is contained in:
Alexei Dobrohotov 2020-10-17 17:32:09 +00:00
commit 4966cd217e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/actors.cpp
View file

@ -1804,11 +1804,9 @@ namespace MWMechanics
osg::Vec2f newMovement = origMovement + movementCorrection; osg::Vec2f newMovement = origMovement + movementCorrection;
// Step to the side rather than backward. Otherwise player will be able to push the NPC far away from it's original location. // Step to the side rather than backward. Otherwise player will be able to push the NPC far away from it's original location.
newMovement.y() = std::max(newMovement.y(), 0.f); newMovement.y() = std::max(newMovement.y(), 0.f);
if (isMoving)
{ // Keep the original speed.
newMovement.normalize(); newMovement.normalize();
newMovement *= origMovement.length(); if (isMoving)
} newMovement *= origMovement.length(); // Keep the original speed.
movement.mPosition[0] = newMovement.x(); movement.mPosition[0] = newMovement.x();
movement.mPosition[1] = newMovement.y(); movement.mPosition[1] = newMovement.y();
if (shouldTurnToApproachingActor) if (shouldTurnToApproachingActor)