Merge pull request #12021 from Trisjdc/spell_target_dest

Core/Spells: Replace MovePosition by MovePositionToFirstCollision in spell dest target handling.
This commit is contained in:
jackpoz
2014-05-13 21:02:07 +02:00
+3 -6
View File
@@ -1292,10 +1292,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
dist = objSize + (dist - objSize) * float(rand_norm());
Position pos = dest._position;
if (targetType.GetTarget() == TARGET_DEST_CASTER_FRONT_LEAP)
m_caster->MovePositionToFirstCollision(pos, dist, angle);
else
m_caster->MovePosition(pos, dist, angle);
m_caster->MovePositionToFirstCollision(pos, dist, angle);
dest.Relocate(pos);
break;
@@ -1328,7 +1325,7 @@ void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplici
dist = objSize + (dist - objSize) * float(rand_norm());
Position pos = dest._position;
target->MovePosition(pos, dist, angle);
target->MovePositionToFirstCollision(pos, dist, angle);
dest.Relocate(pos);
break;
@@ -1367,7 +1364,7 @@ void Spell::SelectImplicitDestDestTargets(SpellEffIndex effIndex, SpellImplicitT
dist *= float(rand_norm());
Position pos = dest._position;
m_caster->MovePosition(pos, dist, angle);
m_caster->MovePositionToFirstCollision(pos, dist, angle);
dest.Relocate(pos);
break;