diff options
| author | azazel <none@none> | 2010-08-28 21:01:16 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-28 21:01:16 +0600 |
| commit | 71de9aa79f1630e7a8f8da741cfbf549af755dc2 (patch) | |
| tree | 8c3c1146473934c5cf2585e05a65ee9cb5c8f7dd /src/server/game/Spells/SpellEffects.cpp | |
| parent | d91ec9d8dc251c3063b526f9297f5f7303bafc4e (diff) | |
DB Scripts: Fix calling of DB scripts from spell_scripts table
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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*/) |