From 99cf79bdf7db602d213210b60bbd37a708e45e88 Mon Sep 17 00:00:00 2001 From: megamage Date: Tue, 25 Nov 2008 17:58:06 -0600 Subject: *Do not let Steady shot pause autoshot timer. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bindings') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index a74b59c872c..415ab7f9185 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -190,7 +190,7 @@ void ScriptedAI::DoStartNoMovement(Unit* victim) void ScriptedAI::DoMeleeAttackIfReady() { //Make sure our attack is ready and we aren't currently casting before checking distance - if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false)) + if (m_creature->isAttackReady() && !m_creature->hasUnitState(UNIT_STAT_CASTING)) { //If we are within range melee the target if (m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) @@ -199,7 +199,7 @@ void ScriptedAI::DoMeleeAttackIfReady() m_creature->resetAttackTimer(); } } - if (m_creature->haveOffhandWeapon() && m_creature->isAttackReady(OFF_ATTACK) && !m_creature->IsNonMeleeSpellCasted(false)) + if (m_creature->haveOffhandWeapon() && m_creature->isAttackReady(OFF_ATTACK) && !m_creature->hasUnitState(UNIT_STAT_CASTING)) { //If we are within range melee the target if (m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE)) -- cgit v1.2.3