mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 04:41:32 +00:00
Code Issues Releases Wiki Activity

Minor fixes

Browse source 
Fix extra semicolon
Disable collision avoidance if AI is disabled
This commit is contained in:
Alexei Dobrohotov 2020-11-13 22:53:12 +03:00
parent 981fffe590
commit 8a6d3d1b4f
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)