diff options
author | ariel- <ariel-@users.noreply.github.com> | 2016-11-13 22:15:03 -0300 |
---|---|---|
committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-12-26 20:30:36 +0100 |
commit | 43260b7ebb899e2ee34f6382b3a697b43629a153 (patch) | |
tree | e05014a1fd17b1bb5163c809a1b5ad9f645ee7be | |
parent | 5465b4f46ea37680106d3c7a618d362ee1ec7ade (diff) |
Core/SpellScript: allow optional parameters to be passed to FinishCast
followup of 50a3ce5703bdaa4fe16e2e773eabafa9a4818083
(cherry picked from commit aa21137aeb5cc9034dad47ea3fc0e46232d80db0)
-rw-r--r-- | src/server/game/Spells/SpellScript.cpp | 4 | ||||
-rw-r--r-- | 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); }; |