From 19cd259113e3788ec1b4b07654d5899b2fbaa881 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 5 Jul 2011 02:58:14 +0100 Subject: Core/Spells: Remove utterly wrong delay on GameObject activate spells --- src/server/game/Spells/SpellEffects.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index c77a888cee7..957de72b75c 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5520,23 +5520,17 @@ void Spell::EffectSummonPlayer(SpellEffIndex /*effIndex*/) unitTarget->ToPlayer()->GetSession()->SendPacket(&data); } -static ScriptInfo generateActivateCommand() -{ - ScriptInfo si; - si.command = SCRIPT_COMMAND_ACTIVATE_OBJECT; - return si; -} - void Spell::EffectActivateObject(SpellEffIndex effIndex) { if (!gameObjTarget) return; - static ScriptInfo activateCommand = generateActivateCommand(); + ScriptInfo activateCommand; + activateCommand.command = SCRIPT_COMMAND_ACTIVATE_OBJECT; - int32 delay_secs = m_spellInfo->EffectMiscValue[effIndex]; + // int32 unk = m_spellInfo->EffectMiscValue[effIndex]; // This is set for EffectActivateObject spells; needs research - gameObjTarget->GetMap()->ScriptCommandStart(activateCommand, delay_secs, m_caster, gameObjTarget); + gameObjTarget->GetMap()->ScriptCommandStart(activateCommand, 0, m_caster, gameObjTarget); } void Spell::EffectApplyGlyph(SpellEffIndex effIndex) -- cgit v1.2.3