From 48765f2ff28a1634d7a994d8b71f0b1ebc3b1a05 Mon Sep 17 00:00:00 2001
From: mrcheko <cheko@sevas.ua>
Date: Mon, 19 Sep 2016 23:43:26 +0300
Subject: [PATCH] fix using potion as weapon

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

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index c821eac0d2..298a3024e4 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -229,7 +229,8 @@ namespace MWMechanics
         osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
         float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
 
-        storage.mReadyToAttack = (distToTarget <= rangeAttack);
+        bool isPotion = (dynamic_cast<ActionPotion*>(currentAction.get()) != NULL);
+        storage.mReadyToAttack = (!isPotion && distToTarget <= rangeAttack);
         
         // can't fight if attacker can't go where target is.  E.g. A fish can't attack person on land.
         if (distToTarget > rangeAttack