aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2012-02-22 19:15:52 +0100
committerMachiavelli <machiavelli.trinity@gmail.com>2012-02-22 19:16:47 +0100
commitfa546d1428989a4e3eb17ad60be34ab3f5f08ab8 (patch)
tree0e1bec650983806c70892b39e49aa55e7fcc5341
parent1536a340afbd5ca598e6c23ee5f0dca84b74f6a3 (diff)
Core/Spells: Change logic in assertion in Spell::SelectImplicitTargetObjectTargets.
Not sure if this a step in the right direction for the intended design, but following the logic of the function there should be OR unit target OR gameobject target OR item target pointers available. If Item target doesn't belong there then the already present AddItemTarget call should be removed.
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index e4724d58a3c..d4f23d1d68e 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1508,7 +1508,7 @@ void Spell::SelectImplicitCasterObjectTargets(SpellEffIndex effIndex, SpellImpli
void Spell::SelectImplicitTargetObjectTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType)
{
- ASSERT(m_targets.GetObjectTarget() && "Spell::SelectImplicitTargetObjectTargets - no explicit object target available!");
+ ASSERT((m_targets.GetObjectTarget() || m_targets.GetItemTarget()) && "Spell::SelectImplicitTargetObjectTargets - no explicit object or item target available!");
if (Unit* unit = m_targets.GetUnitTarget())
AddUnitTarget(unit, 1 << effIndex);
else if (GameObject* gobj = m_targets.GetGOTarget())