Allow Actors to pick an attack type/animation when no AI applies

8 months ago · 1e05bb20bf
parent 2bed7450b6
commit 1e05bb20bf
1 changed files with 3 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -1645,12 +1645,14 @@ namespace MWMechanics
                {
                    std::string startKey = "start";
                    std::string stopKey = "stop";
+                    MWBase::LuaManager::ActorControls* actorControls
+                        = MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);

                    if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
                    {
                        if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
                            mAttackType = "shoot";
-                        else if (mPtr == getPlayer())
+                        else if (mPtr == getPlayer() || actorControls->mDisableAI)
                        {
                            if (Settings::game().mBestAttack)
                            {