Changeset 231 for trunk/src/game/Spell.cpp

Timestamp:

11/19/08 13:48:54 (17 years ago)

Author:

yumileroy

Message:

[svn] Add UNIT_STAT_CASTING, and use it to update attack timer as test.

Original author: megamage
Date: 2008-11-14 17:42:00-06:00

Files:

• trunk/src/game/Spell.cpp (modified) (3 diffs)

trunk/src/game/Spell.cpp

@@ -2143 +2143 @@
         m_selfContainer = &(m_caster->m_currentSpells[GetCurrentContainer()]);
         SendSpellStart();
+        m_caster->addUnitState(UNIT_STAT_CASTING);
     }
 }
@@ -2667 +2668 @@
         return;
 
+    if(m_spellState == SPELL_STATE_FINISHED)
+        return;
+
+    m_spellState = SPELL_STATE_FINISHED;
+
     if(IsChanneledSpell(m_spellInfo))
         m_caster->UpdateInterruptMask();
 
-    if(m_spellState == SPELL_STATE_FINISHED)
-        return;
-
-    m_spellState = SPELL_STATE_FINISHED;
+    if(!m_caster->IsNonMeleeSpellCasted(false, false, true))
+        m_caster->clearUnitState(UNIT_STAT_CASTING);
 
     //remove spell mods
@@ -2708 +2712 @@
     }
 
-    if (IsMeleeAttackResetSpell())
+    /*if (IsMeleeAttackResetSpell())
     {
         m_caster->resetAttackTimer(BASE_ATTACK);
         if(m_caster->haveOffhandWeapon())
             m_caster->resetAttackTimer(OFF_ATTACK);
-    }
+    }*/
 
     /*if (IsRangedAttackResetSpell())