From d753df4ae9aac7e699ad1ef92d37a97b659f6884 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 1 Oct 2020 20:23:40 +0200 Subject: [PATCH] Core/Spells: improved spell finish reason enum naming for finished channeled spells --- src/server/game/Spells/Spell.cpp | 2 +- src/server/game/Spells/Spell.h | 2 +- .../BastionOfTwilight/boss_ascendant_council.cpp | 2 +- .../BlackrockMountain/BlackwingDescent/boss_maloriak.cpp | 2 +- .../EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp | 2 +- .../scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 593718414a..9b1d2c2e83 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -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; } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index c757e5a958..ae082845af 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -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 diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index 80da816bfc..d020aad668 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index 5633a4025f..dc3f710532 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -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); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp index 6847e3730c..b8d61f8298 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp @@ -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); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 3f2b8a5e86..9135a85e6c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -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(); }