From 2e79d3524f12a525c337c5ce8d84b793cacd6e91 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 20 Apr 2025 15:41:58 +0200 Subject: Core/Spells: Rename confusing SpellState enum values * SPELL_STATE_CASTING -> SPELL_STATE_CHANNELING (was used for "channel in progress") * SPELL_STATE_DELAYED -> SPELL_STATE_LAUNCHED --- src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp | 2 +- .../CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index f2e09b6605a..fabd012123b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -2465,7 +2465,7 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 { PreventDefaultAction(); if (Spell* spell = GetTarget()->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) - if (spell->getState() == SPELL_STATE_CASTING) + if (spell->getState() == SPELL_STATE_CHANNELING) GetTarget()->InterruptSpell(CURRENT_CHANNELED_SPELL); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 0c6aa3f1fb5..f19b3d010f3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -743,12 +743,7 @@ struct npc_greyheart_spellbinder : public ScriptedAI { if (Player* i_pl = itr->GetSource()) { - bool isCasting = false; - for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) - if (i_pl->GetCurrentSpell(i)) - isCasting = true; - - if (isCasting) + if (i_pl->IsNonMeleeSpellCast(false, false, true)) { DoCast(i_pl, SPELL_EARTHSHOCK); break; -- cgit v1.2.3