From 43260b7ebb899e2ee34f6382b3a697b43629a153 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 13 Nov 2016 22:15:03 -0300 Subject: [PATCH] Core/SpellScript: allow optional parameters to be passed to FinishCast followup of 50a3ce5703bdaa4fe16e2e773eabafa9a4818083 (cherry picked from commit aa21137aeb5cc9034dad47ea3fc0e46232d80db0) --- src/server/game/Spells/SpellScript.cpp | 4 ++-- src/server/game/Spells/SpellScript.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index d2bcb86c629..e1e877f02db 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -668,9 +668,9 @@ SpellInfo const* SpellScript::GetTriggeringSpell() const return m_spell->m_triggeredByAuraSpell; } -void SpellScript::FinishCast(SpellCastResult result) +void SpellScript::FinishCast(SpellCastResult result, uint32* param1 /*= nullptr*/, uint32* param2 /*= nullptr*/) { - m_spell->SendCastResult(result); + m_spell->SendCastResult(result, param1, param2); m_spell->finish(result == SPELL_CAST_OK); } diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index e959abf2ecb..e08db68cc22 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -479,7 +479,7 @@ class TC_GAME_API SpellScript : public _SpellScript SpellInfo const* GetTriggeringSpell() const; // finishes spellcast prematurely with selected error message - void FinishCast(SpellCastResult result); + void FinishCast(SpellCastResult result, uint32* param1 = nullptr, uint32* param2 = nullptr); void SetCustomCastResultMessage(SpellCustomErrors result); };