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/game/Spell.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/game/Spell.cpp') diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 5cdbef26eed..0999862f74f 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2745,15 +2745,17 @@ void Spell::finish(bool ok) } } - /*if (IsMeleeAttackResetSpell()) + if (IsMeleeAttackResetSpell()) { m_caster->resetAttackTimer(BASE_ATTACK); if(m_caster->haveOffhandWeapon()) m_caster->resetAttackTimer(OFF_ATTACK); - }*/ + if(!(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT)) + m_caster->resetAttackTimer(RANGED_ATTACK); + } - /*if (IsRangedAttackResetSpell()) - m_caster->resetAttackTimer(RANGED_ATTACK);*/ + //if (IsRangedAttackResetSpell()) + // m_caster->resetAttackTimer(RANGED_ATTACK); // Clear combo at finish state if(m_caster->GetTypeId() == TYPEID_PLAYER && NeedsComboPoints(m_spellInfo)) -- cgit v1.2.3