mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'minorfixes' into 'master'

Browse Source 
Minor fixes

See merge request OpenMW/openmw!405
This commit is contained in:
psi29a 2020-11-13 20:56:55 +00:00
commit e73a0f8a2a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/actors.cpp
View File

@ -1731,6 +1731,9 @@ namespace MWMechanics
void Actors::predictAndAvoidCollisions() void Actors::predictAndAvoidCollisions()
{ {
if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
return;
const float minGap = 10.f; const float minGap = 10.f;
const float maxDistForPartialAvoiding = 200.f; const float maxDistForPartialAvoiding = 200.f;
const float maxDistForStrictAvoiding = 100.f; const float maxDistForStrictAvoiding = 100.f;

2
components/nifosg/controller.hpp
View File

@ -83,7 +83,7 @@ namespace NifOsg
mLastLowKey = mKeys->mKeys.end(); mLastLowKey = mKeys->mKeys.end();
mLastHighKey = mKeys->mKeys.end(); mLastHighKey = mKeys->mKeys.end();
} }
}; }
ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT()) ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
: mKeys(keys) : mKeys(keys)