mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-28 19:21:04 +00:00
Merge branch 'fix_new_game_guard_2' into 'master'
Reapply new game guard fix See merge request OpenMW/openmw!944
This commit is contained in:
commit
eca0a95a5a
@ -476,6 +476,6 @@ osg::Vec3f MWMechanics::AiPackage::getNextPathPoint(const osg::Vec3f& destinatio
|
|||||||
float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
|
float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
|
||||||
{
|
{
|
||||||
if (mPathFinder.getPathSize() <= 1)
|
if (mPathFinder.getPathSize() <= 1)
|
||||||
return mLastDestinationTolerance;
|
return std::max(DEFAULT_TOLERANCE, mLastDestinationTolerance);
|
||||||
return getPointTolerance(speed, duration, halfExtents);
|
return getPointTolerance(speed, duration, halfExtents);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user