From 7820ea5806f95065dbbb02cda5873203c4228004 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 30 Jan 2014 03:14:22 +0100
Subject: [PATCH] "Always best attack" should only affect the player

---
 apps/openmw/mwmechanics/character.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 32a05832c..63f363045 100644
--- 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();