From 9b141207d170e4b2b4e6d9290d5f921f76cbcea0 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 30 Dec 2017 20:28:41 +0100 Subject: [3.3.5] CastSpell unclusterfucking (that's a word now) (#21123) Core/Spell: The giant CastSpell unclusterfucking (that's a word now) of this generation. - CastSpell now always takes three arguments - target, spellId, and a struct containing extra arguments - This struct (CastSpellExtraArgs, see SpellDefines.h) serves as a conglomerate of every previous combination of the 20 billion different CastSpell overloads, all merged into one - It has some great utility constructors - check them out! All of these can be used to implicitly construct the ExtraArgs object. - A gajillion refactors to make everything behave the way it always has (cherry picked from commit d507a7e3388382960108b24143da48e5f912b4a7) --- src/server/game/Spells/SpellMgr.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/server/game/Spells/SpellMgr.cpp') diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 206e5a35cac..76b7aa34161 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3455,14 +3455,16 @@ void SpellMgr::LoadSpellInfoCorrections() 52438, // Summon Skittering Swarmer (Force Cast) 52449, // Summon Skittering Infector (Force Cast) 53609, // Summon Anub'ar Assassin (Force Cast) - 53457 // Summon Impale Trigger (AoE) + 53457, // Summon Impale Trigger (AoE) + 45907 // Torch Target Picker }, [](SpellInfo* spellInfo) { spellInfo->MaxAffectedTargets = 1; }); - // Skartax Purple Beam - ApplySpellFix({ 36384 }, [](SpellInfo* spellInfo) + ApplySpellFix({ + 36384 // Skartax Purple Beam + }, [](SpellInfo* spellInfo) { spellInfo->MaxAffectedTargets = 2; }); -- cgit v1.2.3