diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-02-09 11:17:05 -0800 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-02-09 11:17:05 -0800 |
| commit | 9791bb599ae85f26e1b5535e916263b0e97a0446 (patch) | |
| tree | 628f8ed69c9b9b3d63dd1991712ff6af2a364388 /src/server/game/Movement/MotionMaster.cpp | |
| parent | 4623db0abe917ed7099873456125b906e017ad4b (diff) | |
| parent | 93d199f04382fe3c7f6f08f59fd2ad058568679a (diff) | |
Merge pull request #5160 from TrinityCore/dynamic_vmaps
Added Dynamic Vmaps, RE-EXTRACT YOUR VMAPS
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rwxr-xr-x | src/server/game/Movement/MotionMaster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 4945ae2a014..c7cf9be9a38 100755 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -374,7 +374,7 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee void MotionMaster::MoveFall(uint32 id/*=0*/) { // use larger distance for vmap height search than in most other cases - float tz = i_owner->GetMap()->GetHeight(i_owner->GetPositionX(), i_owner->GetPositionY(), i_owner->GetPositionZ(), true, MAX_FALL_DISTANCE); + float tz = i_owner->GetMap()->GetHeight(i_owner->GetPhaseMask(), i_owner->GetPositionX(), i_owner->GetPositionY(), i_owner->GetPositionZ(), true, MAX_FALL_DISTANCE); if (tz <= INVALID_HEIGHT) { sLog->outStaticDebug("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).", @@ -387,7 +387,7 @@ void MotionMaster::MoveFall(uint32 id/*=0*/) return; Movement::MoveSplineInit init(*i_owner); - init.MoveTo(i_owner->GetPositionX(),i_owner->GetPositionY(),tz); + init.MoveTo(i_owner->GetPositionX(), i_owner->GetPositionY(), tz); init.SetFall(); init.Launch(); Mutate(new EffectMovementGenerator(id), MOTION_SLOT_CONTROLLED); |