"Always best attack" should only affect the player

11 years ago · 7820ea5806
parent d0c6ecd03a
commit 7820ea5806
1 changed files with 2 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -691,7 +691,8 @@ bool CharacterController::updateWeaponState()
                    mAttackType = "shoot";
                else
                {
-                    if(isWeapon && Settings::Manager::getBool("best attack", "Game"))
+                    if(isWeapon && mPtr.getRefData().getHandle() == "player" &&
+                            Settings::Manager::getBool("best attack", "Game"))
                        mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
                    else
                        determineAttackType();