Changeset 239 for trunk/src/game

Timestamp:

11/19/08 13:49:43 (17 years ago)

Author:

yumileroy

Message:

[svn] *Update Kalecgos script.
*Correctly select aura triggered spell target.
*Fix some scripts, should be pGOHello = &
*Fix a bug that some channel spells cannot be interrupted.
*Fix a bug that not-selectable creature cannot be hit by target_entry spells.
*If eventAI cannot find heroic flag and normal flag, enable event as default rather than disable it.

Original author: megamage
Date: 2008-11-15 15:09:22-06:00

Location:

trunk/src/game

Files:

• Spell.cpp (modified) (1 diff)
• Unit.cpp (modified) (2 diffs)

trunk/src/game/Spell.cpp

@@ -4929 +4929 @@
         // unselectable targets skipped in all cases except TARGET_SCRIPT targeting
         // in case TARGET_SCRIPT target selected by server always and can't be cheated
-        if( target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) &&
+        /*if( target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) &&
             m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SCRIPT &&
             m_spellInfo->EffectImplicitTargetB[eff] != TARGET_SCRIPT )
-            return false;
+            return false;*/
     }
 

trunk/src/game/Unit.cpp

@@ -498 +498 @@
     // interrupt channeled spell
     if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL])
-        if(spell->getState() == SPELL_STATE_CASTING && (spell->m_spellInfo->AuraInterruptFlags & flag))
+        if(spell->getState() == SPELL_STATE_CASTING && (spell->m_spellInfo->ChannelInterruptFlags & flag))
             InterruptNonMeleeSpells(false);
 }
@@ -512 +512 @@
     if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL])
         if(spell->getState() == SPELL_STATE_CASTING)
-            m_interruptMask |= spell->m_spellInfo->AuraInterruptFlags;
+            m_interruptMask |= spell->m_spellInfo->ChannelInterruptFlags;
 }