Changeset 231 for trunk

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

Location:

trunk/src/game

Files:

• Spell.cpp (modified) (3 diffs)
• Unit.cpp (modified) (1 diff)
• Unit.h (modified) (1 diff)

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())

trunk/src/game/Unit.cpp

@@ -284 +284 @@
     }
 
-    if(uint32 base_att = getAttackTimer(BASE_ATTACK))
-        setAttackTimer(BASE_ATTACK, (p_time >= base_att ? 0 : base_att - p_time) );
-    if(uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
-        setAttackTimer(RANGED_ATTACK, (p_time >= ranged_att ? 0 : ranged_att - p_time) );
-    if(uint32 off_att = getAttackTimer(OFF_ATTACK))
-        setAttackTimer(OFF_ATTACK, (p_time >= off_att ? 0 : off_att - p_time) );
+    if(!hasUnitState(UNIT_STAT_CASTING))
+    {
+        if(uint32 base_att = getAttackTimer(BASE_ATTACK))
+            setAttackTimer(BASE_ATTACK, (p_time >= base_att ? 0 : base_att - p_time) );
+        if(uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
+            setAttackTimer(RANGED_ATTACK, (p_time >= ranged_att ? 0 : ranged_att - p_time) );
+        if(uint32 off_att = getAttackTimer(OFF_ATTACK))
+            setAttackTimer(OFF_ATTACK, (p_time >= off_att ? 0 : off_att - p_time) );
+    }
 
     // update abilities available only for fraction of time

trunk/src/game/Unit.h

@@ -364 +364 @@
     UNIT_STAT_ISOLATED        = 0x2000,                     // area auras do not affect other players
     UNIT_STAT_ATTACK_PLAYER   = 0x4000,
+    UNIT_STAT_CASTING         = 0x8000,
     UNIT_STAT_ALL_STATE       = 0xffff                      //(UNIT_STAT_STOPPED | UNIT_STAT_MOVING | UNIT_STAT_IN_COMBAT | UNIT_STAT_IN_FLIGHT)
 };