From 2b9e22f593ebc862cfdc1df070249725e760a460 Mon Sep 17 00:00:00 2001
From: dteviot <dteviot@gmail.com>
Date: Sun, 9 Aug 2015 14:29:38 +1200
Subject: [PATCH] extracted function stopAttack().

---
 apps/openmw/mwmechanics/aicombat.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 8a51a4cb07..5ea3ba6a3b 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -117,6 +117,7 @@ namespace MWMechanics
         void startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController, 
             const ESM::Weapon* weapon, bool distantCombat);
         void updateAttack(CharacterController& characterController);
+        void stopAttack();
     };
     
     AiCombat::AiCombat(const MWWorld::Ptr& actor) :
@@ -221,10 +222,9 @@ namespace MWMechanics
     {
         MWMechanics::Movement& movement = storage.mMovement;
 
-        // Stop attacking if target is not seen
         if (isTargetMagicallyHidden(target))
         {
-            movement.mPosition[1] = movement.mPosition[0] = 0;
+            storage.stopAttack();
             return false; // TODO: run away instead of doing nothing
         }
 
@@ -368,11 +368,7 @@ namespace MWMechanics
                 && !actorClass.isNpc() && !MWMechanics::isEnvironmentCompatible(actor, target))
         {
             // TODO: start fleeing?
-            movement.mPosition[0] = 0;
-            movement.mPosition[1] = 0;
-            movement.mPosition[2] = 0;
-            readyToAttack = false;
-            characterController.setAttackingOrSpell(false);
+            storage.stopAttack();
             return false;
         }
 
@@ -686,6 +682,15 @@ namespace MWMechanics
         }
         characterController.setAttackingOrSpell(mAttack);
     }
+
+    void AiCombatStorage::stopAttack()
+    {
+        mMovement.mPosition[0] = 0;
+        mMovement.mPosition[1] = 0;
+        mMovement.mPosition[2] = 0;
+        mReadyToAttack = false;
+        mAttack = false;
+    }
 }