aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellEffects.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-06-27 15:29:06 +0200
committerQAston <none@none>2009-06-27 15:29:06 +0200
commita74ae1873997342ab79ae5db12d6361d7865000f (patch)
tree97b3e7e37e9b546fb77191d2943bbbf8ac9c3685 /src/game/SpellEffects.cpp
parent81042a1f4f6a62e784629d7893c28c1de31a1803 (diff)
parent4a93373c0698a4b9b05f91bbedf1f1b8b9880238 (diff)
*Merge tc1 commits 1582-1590
--HG-- branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r--src/game/SpellEffects.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 1de51e112fb..d5ee8a0b731 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5991,23 +5991,23 @@ void Spell::EffectMomentMove(uint32 i)
dist = sqrt((x-destx)*(x-destx) + (y-desty)*(y-desty));
step = dist/10.0f;
}
-
+
int j = 0;
for(j; j<10 ;j++)
{
- if(fabs(z - destz) > 6)
- {
- destx -= step * cos(orientation);
- desty -= step * sin(orientation);
- ground = unitTarget->GetMap()->GetHeight(destx,desty,MAX_HEIGHT,true);
- floor = unitTarget->GetMap()->GetHeight(destx,desty,z, true);
- destz = fabs(ground - z) <= fabs(floor - z) ? ground:floor;
- }else
- break;
+ if(fabs(z - destz) > 6)
+ {
+ destx -= step * cos(orientation);
+ desty -= step * sin(orientation);
+ ground = unitTarget->GetMap()->GetHeight(destx,desty,MAX_HEIGHT,true);
+ floor = unitTarget->GetMap()->GetHeight(destx,desty,z, true);
+ destz = fabs(ground - z) <= fabs(floor - z) ? ground:floor;
+ }else
+ break;
}
if(j == 9)
{
- return;
+ return;
}
unitTarget->NearTeleportTo(destx, desty, destz + 0.07531, orientation, unitTarget==m_caster);