Core/Spells: improved spell finish reason enum naming for finished channeled spells

This commit is contained in:
Ovahlord committed 2020-10-01 20:24:03 +02:00
1 parent 40afd8a20e
commit d753df4ae9
6 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -3957,7 +3957,7 @@ void Spell::update(uint32 difftime)
if (Creature* creatureCaster = m_caster->ToCreature())
if (creatureCaster->IsAIEnabled)
creatureCaster->AI()->OnSpellCastFinished(m_spellInfo, SPELL_FINISHED_FINISHED);
creatureCaster->AI()->OnSpellCastFinished(m_spellInfo, SPELL_FINISHED_CHANNELING_COMPLETE);
}
break;
}
+1 -1
View File
@@ -114,7 +114,7 @@ enum SpellFinishReason : uint8
{
SPELL_FINISHED_SUCCESSFUL_CAST = 0, // spell has sucessfully launched
SPELL_FINISHED_CANCELED = 1, // spell has been canceled (interrupts)
SPELL_FINISHED_FINISHED = 2 // spell has been finished (channeling finished)
SPELL_FINISHED_CHANNELING_COMPLETE = 2 // spell channeling has been finished
};
struct TC_GAME_API SpellDestination
@@ -776,7 +776,7 @@ class npc_ignacious : public CreatureScript
void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override
{
if (spell->Id == SPELL_RISING_FLAMES && (reason == SPELL_FINISHED_CANCELED || reason == SPELL_FINISHED_FINISHED))
if (spell->Id == SPELL_RISING_FLAMES && (reason == SPELL_FINISHED_CANCELED || reason == SPELL_FINISHED_CHANNELING_COMPLETE))
me->MakeInterruptable(false);
}
@@ -324,7 +324,7 @@ struct boss_maloriak : public BossAI
switch (spell->Id)
{
case SPELL_ARCANE_STORM:
if (reason == SPELL_FINISHED_FINISHED || reason == SPELL_FINISHED_CANCELED)
if (reason == SPELL_FINISHED_CHANNELING_COMPLETE || reason == SPELL_FINISHED_CANCELED)
{
me->MakeInterruptable(false);
me->m_Events.KillAllEvents(true);
@@ -138,7 +138,7 @@ struct boss_baron_ashbury : public BossAI
if (spell->Id == SPELL_STAY_OF_EXECUTION)
{
// Failing achievement when Baron Ashbury finished channeling Stay of Execution
if (reason == SPELL_FINISHED_FINISHED && IsHeroic())
if (reason == SPELL_FINISHED_CHANNELING_COMPLETE && IsHeroic())
_pardonDenied = false;
me->SetReactState(REACT_AGGRESSIVE);
@@ -568,7 +568,7 @@ struct boss_stormcaller_brundir : public ScriptedAI
void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override
{
if (spell->Id == SPELL_OVERLOAD && (reason == SPELL_FINISHED_FINISHED || reason == SPELL_FINISHED_CANCELED))
if (spell->Id == SPELL_OVERLOAD && (reason == SPELL_FINISHED_CHANNELING_COMPLETE || reason == SPELL_FINISHED_CANCELED))
_summons.DespawnAll();
}