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

Timestamp:

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

Author:

yumileroy

Message:

[svn] Some update on channeled spells.

Original author: megamage
Date: 2008-11-14 14:19:23-06:00

Files:

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

trunk/src/game/Spell.cpp

@@ -955 +955 @@
         if( !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) )
         {
-            if(!unit->IsStandState() && !unit->hasUnitState(UNIT_STAT_STUNNED))
-                unit->SetStandState(PLAYER_STATE_NONE);
-
             m_caster->CombatStart(unit);
         }
@@ -1283 +1280 @@
         cell_lock->Visit(cell_lock, world_object_notifier, *MapManager::Instance().GetMap(m_caster->GetMapId(), m_caster));
     }
-    if(!(spellmgr.GetSpellCustomAttr(m_spellInfo->Id) & SPELL_ATTR_CU_PLAYERS_ONLY))
+    if(!(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY))
     {
         TypeContainerVisitor<Trinity::SpellNotifierCreatureAndPlayer, GridTypeMapContainer >  grid_object_notifier(notifier);
@@ -2298 +2295 @@
 
     // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells
-    if (m_spellInfo->speed > 0.0f)
+    if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo))
     {
 
@@ -2325 +2322 @@
     {
         m_spellState = SPELL_STATE_CASTING;
+        m_caster->AddInterruptMask(m_spellInfo->ChannelInterruptFlags);
         SendChannelStart(GetSpellDuration(m_spellInfo));
     }
@@ -2568 +2566 @@
     {
         // always cancel for channeled spells
-        if( m_spellState == SPELL_STATE_CASTING )
-            cancel();
+        //if( m_spellState == SPELL_STATE_CASTING )
+        //    cancel();
         // don't cancel for melee, autorepeat, triggered and instant spells
-        else if(!IsNextMeleeSwingSpell() && !IsAutoRepeat() && !m_IsTriggeredSpell && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT))
+        //else
+        if(!IsNextMeleeSwingSpell() && !IsAutoRepeat() && !m_IsTriggeredSpell && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT))
             cancel();
     }
@@ -2602 +2601 @@
                     // check for incapacitating player states
                     if( m_caster->hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_CONFUSED))
-                        cancel();
-
-                    // check if player has turned if flag is set
-                    if( m_spellInfo->ChannelInterruptFlags & CHANNEL_FLAG_TURNING && m_castOrientation != m_caster->GetOrientation() )
                         cancel();
                 }
@@ -2669 +2664 @@
     if(!m_caster)
         return;
+
+    if(IsChanneledSpell(m_spellInfo))
+        m_caster->UpdateInterruptMask();
 
     if(m_spellState == SPELL_STATE_FINISHED)
@@ -4762 +4760 @@
 }
 
-void Spell::Delayed()
-{
-    if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    if (m_spellState == SPELL_STATE_DELAYED)
-        return;                                             // spell is active and can't be time-backed
+void Spell::Delayed() // only called in DealDamage()
+{
+    if(!m_caster)// || m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    //if (m_spellState == SPELL_STATE_DELAYED)
+    //    return;                                             // spell is active and can't be time-backed
 
     // spells not loosing casting time ( slam, dynamites, bombs.. )
-    if(!(m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_DAMAGE))
-        return;
+    //if(!(m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_DAMAGE))
+    //    return;
 
     //check resist chance