From 8a6d3d1b4f2836e09d663354a4074d8bdce0e46d Mon Sep 17 00:00:00 2001 From: Alexei Dobrohotov Date: Fri, 13 Nov 2020 22:53:12 +0300 Subject: [PATCH] Minor fixes Fix extra semicolon Disable collision avoidance if AI is disabled --- apps/openmw/mwmechanics/actors.cpp | 3 +++ components/nifosg/controller.hpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 8f3675ef7..047741bac 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -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; diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp index a29fabefd..996e4ef97 100644 --- a/components/nifosg/controller.hpp +++ b/components/nifosg/controller.hpp @@ -83,7 +83,7 @@ namespace NifOsg mLastLowKey = mKeys->mKeys.end(); mLastHighKey = mKeys->mKeys.end(); } - }; + } ValueInterpolator(std::shared_ptr keys, ValueT defaultVal = ValueT()) : mKeys(keys)