From ba5e3dabc6f8306bb4daf07dcdb07d8901f62f85 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Sat, 3 Jan 2009 13:04:29 +0300 Subject: [PATCH] [7012] Fix use SpellVisual data Signed-off-by: DiSlord --- src/game/Spell.cpp | 2 +- src/game/SpellAuras.cpp | 2 +- src/game/SpellMgr.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 3abe79d1a..89eb3b841 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -5338,7 +5338,7 @@ Unit* Spell::SelectMagnetTarget() bool Spell::IsNeedSendToClient() const { - return m_spellInfo->SpellVisual!=0 || IsChanneledSpell(m_spellInfo) || + return m_spellInfo->SpellVisual[0] || m_spellInfo->SpellVisual[1] || IsChanneledSpell(m_spellInfo) || m_spellInfo->speed > 0.0f || !m_triggeredByAuraSpell && !m_IsTriggeredSpell; } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ee7ab3226..6724b8e43 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4120,7 +4120,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real) case SPELLFAMILY_GENERIC: { // Pounce Bleed - if ( m_spellProto->SpellIconID == 147 && m_spellProto->SpellVisual == 0 ) + if ( m_spellProto->SpellIconID == 147 && m_spellProto->SpellVisual[0] == 0 ) { // $AP*0.18/6 bonus per tick if (apply && !loading && caster) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 39eb917dc..4a08b20f1 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1137,7 +1137,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons case SPELLFAMILY_ROGUE: { // Garrote-Silence -> Garrote (multi-family check) - if( spellInfo_1->SpellIconID == 498 && spellInfo_1->SpellVisual == 0 && spellInfo_2->SpellIconID == 498 ) + if( spellInfo_1->SpellIconID == 498 && spellInfo_1->SpellVisual[0] == 0 && spellInfo_2->SpellIconID == 498 ) return false; break; @@ -1200,7 +1200,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons //Corruption & Seed of corruption if( spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932 || spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 1932 ) - if(spellInfo_1->SpellVisual != 0 && spellInfo_2->SpellVisual != 0) + if(spellInfo_1->SpellVisual[0] != 0 && spellInfo_2->SpellVisual[0] != 0) return true; // can't be stacked // Corruption and Unstable Affliction diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 839c6d868..db510b277 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7011" + #define REVISION_NR "7012" #endif // __REVISION_NR_H__