aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-04-03 12:41:12 +0200
committerthenecromancer <none@none>2010-04-03 12:41:12 +0200
commit71082bd48b3dfd20ea9305e180193daa5a1ccb80 (patch)
tree3f47d55e0042176622d7ef204cebc64467d7e3cb /src
parentaa31f350b35b3c0e6721e3de173a532107efdffa (diff)
Change pull effects speed calculations to work more or less correctly ( no more flying really high )
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellEffects.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index f63b36e8736..7c95149880d 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -6895,14 +6895,8 @@ void Spell::EffectPlayerPull(uint32 i)
if(!unitTarget)
return;
- float speedZ;
- if(m_spellInfo->EffectMiscValue[i])
- speedZ = float(m_spellInfo->EffectMiscValue[i])/10;
- else if(m_spellInfo->EffectMiscValueB[i])
- speedZ = float(m_spellInfo->EffectMiscValueB[i])/10;
- else
- speedZ = 10.0f;
- float speedXY = m_caster->GetExactDist2d(unitTarget) * 10.0f / speedZ;
+ float speedZ = m_spellInfo->EffectBasePoints[i]/10;
+ float speedXY = m_spellInfo->EffectMiscValue[i]/10;
unitTarget->GetMotionMaster()->MoveJump(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), speedXY, speedZ);
}