From 71de9aa79f1630e7a8f8da741cfbf549af755dc2 Mon Sep 17 00:00:00 2001 From: azazel Date: Sat, 28 Aug 2010 21:01:16 +0600 Subject: DB Scripts: Fix calling of DB scripts from spell_scripts table --HG-- branch : trunk --- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index dd56072298d..e6d5f4771ff 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1779,7 +1779,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) // normal DB scripted effect sLog.outDebug("Spell ScriptStart spellid %u in EffectDummy(%u)", m_spellInfo->Id, effIndex); - m_caster->GetMap()->ScriptsStart(sSpellScripts, MAKE_PAIR32(m_spellInfo->Id,effIndex), m_caster, unitTarget); + m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget); // Script based implementation. Must be used only for not good for implementation in core spell effects // So called only for not proccessed cases @@ -5618,7 +5618,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // normal DB scripted effect sLog.outDebug("Spell ScriptStart spellid %u in EffectScriptEffect(%u)", m_spellInfo->Id, effIndex); - m_caster->GetMap()->ScriptsStart(sSpellScripts, MAKE_PAIR32(m_spellInfo->Id,effIndex), m_caster, unitTarget); + m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget); } void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) -- cgit v1.2.3