mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Merge branch 'minorfixes' into 'master'
Minor fixes See merge request OpenMW/openmw!405
This commit is contained in:
commit
e73a0f8a2a
@ -1731,6 +1731,9 @@ namespace MWMechanics
|
||||
|
||||
void Actors::predictAndAvoidCollisions()
|
||||
{
|
||||
if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
|
||||
return;
|
||||
|
||||
const float minGap = 10.f;
|
||||
const float maxDistForPartialAvoiding = 200.f;
|
||||
const float maxDistForStrictAvoiding = 100.f;
|
||||
|
@ -83,7 +83,7 @@ namespace NifOsg
|
||||
mLastLowKey = mKeys->mKeys.end();
|
||||
mLastHighKey = mKeys->mKeys.end();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
|
||||
: mKeys(keys)
|
||||
|
Loading…
x
Reference in New Issue
Block a user