josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Use right function for obtaining spell target type. Fixes assertion failures.

Browse Source
This commit is contained in:
QAston
2012-02-22 10:34:08 +01:00
parent 2a1ffc1cd9
commit 7a261ff9b8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+7 -7
View File
@@ -886,7 +886,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffIndex effIndex, SpellImplicitTa
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitChannelTargets: cannot find channel spell for spell ID %u, effect %u", m_spellInfo->Id, effIndex); sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitChannelTargets: cannot find channel spell for spell ID %u, effect %u", m_spellInfo->Id, effIndex);
return; return;
} }
switch (targetType.GetType()) switch (targetType.GetTarget())
{ {
case TARGET_UNIT_CHANNEL_TARGET: case TARGET_UNIT_CHANNEL_TARGET:
// unit target may be no longer avalible - teleported out of map for example // unit target may be no longer avalible - teleported out of map for example
@@ -1350,7 +1350,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge
void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType) void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType)
{ {
switch(targetType.GetType()) switch(targetType.GetTarget())
{ {
case TARGET_DEST_CASTER: case TARGET_DEST_CASTER:
m_targets.SetDst(*m_caster); m_targets.SetDst(*m_caster);
@@ -1393,18 +1393,18 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
float dist; float dist;
float angle = targetType.CalcDirectionAngle(); float angle = targetType.CalcDirectionAngle();
float objSize = m_caster->GetObjectSize(); float objSize = m_caster->GetObjectSize();
if (targetType.GetType() == TARGET_DEST_CASTER_SUMMON) if (targetType.GetTarget() == TARGET_DEST_CASTER_SUMMON)
dist = PET_FOLLOW_DIST; dist = PET_FOLLOW_DIST;
else else
dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster); dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
if (dist < objSize) if (dist < objSize)
dist = objSize; dist = objSize;
else if (targetType.GetType() == TARGET_DEST_CASTER_RANDOM) else if (targetType.GetTarget() == TARGET_DEST_CASTER_RANDOM)
dist = objSize + (dist - objSize) * (float)rand_norm(); dist = objSize + (dist - objSize) * (float)rand_norm();
Position pos; Position pos;
if (targetType.GetType() == TARGET_DEST_CASTER_FRONT_LEAP) if (targetType.GetTarget() == TARGET_DEST_CASTER_FRONT_LEAP)
m_caster->GetFirstCollisionPosition(pos, dist, angle); m_caster->GetFirstCollisionPosition(pos, dist, angle);
else else
m_caster->GetNearPosition(pos, dist, angle); m_caster->GetNearPosition(pos, dist, angle);
@@ -1430,7 +1430,7 @@ void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplici
float dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster); float dist = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
if (dist < objSize) if (dist < objSize)
dist = objSize; dist = objSize;
else if (targetType.GetType() == TARGET_DEST_TARGET_RANDOM) else if (targetType.GetTarget() == TARGET_DEST_TARGET_RANDOM)
dist = objSize + (dist - objSize) * (float)rand_norm(); dist = objSize + (dist - objSize) * (float)rand_norm();
Position pos; Position pos;
@@ -1536,7 +1536,7 @@ void Spell::SelectImplicitChainTargets(SpellEffIndex effIndex, SpellImplicitTarg
std::list<WorldObject*> targets; std::list<WorldObject*> targets;
SearchChainTargets(targets, maxTargets - 1, target, targetType.GetObjectType(), targetType.GetCheckType() SearchChainTargets(targets, maxTargets - 1, target, targetType.GetObjectType(), targetType.GetCheckType()
, m_spellInfo->Effects[effIndex].ImplicitTargetConditions, targetType.GetType() == TARGET_UNIT_TARGET_CHAINHEAL_ALLY); , m_spellInfo->Effects[effIndex].ImplicitTargetConditions, targetType.GetTarget() == TARGET_UNIT_TARGET_CHAINHEAL_ALLY);
// for backward compability // for backward compability
std::list<Unit*> unitTargets; std::list<Unit*> unitTargets;