From 3f6543860a870f6c7005bb34c63848f289c233c9 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Sun, 11 Sep 2016 00:00:12 +0900
Subject: [PATCH] Make creatures use fHandToHandReach

---
 apps/openmw/mwmechanics/aicombataction.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index a70410035..6dea53e98 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -491,17 +491,9 @@ namespace MWMechanics
 
         if (mWeapon.isEmpty())
         {
-            if (!mIsNpc)
-            {
-                return fCombatDistance;
-            }
-            else
-            {
-                static float fHandToHandReach =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->getFloat();
-
-                return fHandToHandReach * fCombatDistance;
-            }
+            static float fHandToHandReach =
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->getFloat();
+            return fHandToHandReach * fCombatDistance;
         }
 
         const ESM::Weapon* weapon = mWeapon.get<ESM::Weapon>()->mBase;