aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2018-02-04 20:15:38 -0300
committerShauren <shauren.trinity@gmail.com>2021-06-19 23:33:23 +0200
commit01d9306854618bb66f79e1f0f5d9781ff48ab019 (patch)
tree96f77f7f8e47d8597982ce9d9a5920f63faedde9 /src
parenta1e0f3bbf7828e70b0bfdd66b6dabbafbf43bf30 (diff)
Core/Spells: kill unused parameter from Spell constructor
Added in 1f2292af796d4b424bf45711ae8c50e764cf0d61 (cherry picked from commit 9fc732eb97271885568598fc38353cd809043d34)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Handlers/SpellHandler.cpp2
-rw-r--r--src/server/game/Handlers/ToyHandler.cpp2
-rw-r--r--src/server/game/Spells/Spell.cpp7
-rw-r--r--src/server/game/Spells/Spell.h3
4 files changed, 4 insertions, 10 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index ad2a073a4a4..272905b22f7 100644
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -332,7 +332,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPackets::Spells::CastSpell& cast)
if (cast.Cast.MoveUpdate)
HandleMovementOpcode(CMSG_MOVE_STOP, *cast.Cast.MoveUpdate);
- Spell* spell = new Spell(caster, spellInfo, TRIGGERED_NONE, ObjectGuid::Empty, false);
+ Spell* spell = new Spell(caster, spellInfo, TRIGGERED_NONE);
WorldPackets::Spells::SpellPrepare spellPrepare;
spellPrepare.ClientCastID = cast.Cast.CastID;
diff --git a/src/server/game/Handlers/ToyHandler.cpp b/src/server/game/Handlers/ToyHandler.cpp
index 7f310325047..0c9e935f496 100644
--- a/src/server/game/Handlers/ToyHandler.cpp
+++ b/src/server/game/Handlers/ToyHandler.cpp
@@ -81,7 +81,7 @@ void WorldSession::HandleUseToy(WorldPackets::Toy::UseToy& packet)
SpellCastTargets targets(_player, packet.Cast);
- Spell* spell = new Spell(_player, spellInfo, TRIGGERED_NONE, ObjectGuid::Empty, false);
+ Spell* spell = new Spell(_player, spellInfo, TRIGGERED_NONE);
WorldPackets::Spells::SpellPrepare spellPrepare;
spellPrepare.ClientCastID = packet.Cast.CastID;
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 2b3eb323e3b..415aca2d9f6 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -521,12 +521,11 @@ protected:
Spell* m_Spell;
};
-Spell::Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID, bool skipCheck) :
+Spell::Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID) :
m_spellInfo(info), m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerOrOwner()) ? caster->GetCharmerOrOwner() : caster),
m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr)
{
m_customError = SPELL_CUSTOM_ERROR_NONE;
- m_skipCheck = skipCheck;
m_fromClient = false;
m_selfContainer = nullptr;
m_referencedFromCurrentSpell = false;
@@ -2130,11 +2129,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*=
// Calculate hit result
if (m_originalCaster)
- {
targetInfo.missCondition = m_originalCaster->SpellHitResult(target, m_spellInfo, m_canReflect && !(IsPositive() && m_caster->IsFriendlyTo(target)));
- if (m_skipCheck && targetInfo.missCondition != SPELL_MISS_IMMUNE)
- targetInfo.missCondition = SPELL_MISS_NONE;
- }
else
targetInfo.missCondition = SPELL_MISS_EVADE; //SPELL_MISS_NONE;
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 5966a8b1193..ea980d151a8 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -492,7 +492,7 @@ class TC_GAME_API Spell
typedef std::unordered_set<Aura*> UsedSpellMods;
- Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID = ObjectGuid::Empty, bool skipCheck = false);
+ Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID = ObjectGuid::Empty);
~Spell();
void InitExplicitTargets(SpellCastTargets const& targets);
@@ -897,7 +897,6 @@ class TC_GAME_API Spell
// and in same time need aura data and after aura deleting.
SpellInfo const* m_triggeredByAuraSpell;
- bool m_skipCheck;
std::unique_ptr<PathGenerator> m_preGeneratedPath;
std::vector<SpellLogEffectPowerDrainParams> _powerDrainTargets[MAX_SPELL_EFFECTS];