Merge git://github.com/TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h

31 files changed, 138 insertions, 134 deletions

diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index 5066804d60f..5066804d60f 100755..100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp
index 997d066a9f2..997d066a9f2 100755..100644
--- a/src/server/game/Movement/FollowerReference.cpp
+++ b/src/server/game/Movement/FollowerReference.cpp
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index 6a1a3719cb8..6a1a3719cb8 100755..100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 48f17a0d0c6..600165f5d97 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -378,14 +378,14 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
     Mutate(new EffectMovementGenerator(id), MOTION_SLOT_CONTROLLED);
 }
 
-void MotionMaster::MoveFall(uint32 id/*=0*/)
+void MotionMaster::MoveFall(uint32 id /*=0*/)
 {
     // use larger distance for vmap height search than in most other cases
     float tz = _owner->GetMap()->GetHeight(_owner->GetPhaseMask(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), true, MAX_FALL_DISTANCE);
     if (tz <= INVALID_HEIGHT)
     {
         sLog->outDebug(LOG_FILTER_GENERAL, "MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
-            _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ());
+            _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ());
         return;
     }
 
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 0dd9248da7a..b0676e02f51 100755..100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -165,7 +165,9 @@ class MotionMaster //: private std::stack<MovementGenerator *>
         void MoveCharge(PathGenerator path, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE);
         void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ);
         void MoveJumpTo(float angle, float speedXY, float speedZ);
-        void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = 0);
+        void MoveJump(Position const& pos, float speedXY, float speedZ, uint32 id = EVENT_JUMP)
+            { MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); };
+        void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = EVENT_JUMP);
         void MoveFall(uint32 id = 0);
 
         void MoveSeekAssistance(float x, float y, float z);
diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp
index 73921ea86ff..73921ea86ff 100755..100644
--- a/src/server/game/Movement/MovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerator.cpp
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index ee8dfb51cce..43d03160a41 100755
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -38,7 +38,7 @@ class MovementGenerator
 
         virtual void Reset(Unit*) = 0;
 
-        virtual bool Update(Unit*, const uint32& time_diff) = 0;
+        virtual bool Update(Unit*, uint32 time_diff) = 0;
 
         virtual MovementGeneratorType GetMovementGeneratorType() = 0;
 
@@ -70,7 +70,7 @@ class MovementGeneratorMedium : public MovementGenerator
             (static_cast<D*>(this))->Reset(static_cast<T*>(u));
         }
 
-        bool Update(Unit* u, const uint32& time_diff)
+        bool Update(Unit* u, uint32 time_diff)
         {
             //u->AssertIsType<T>();
             return (static_cast<D*>(this))->Update(static_cast<T*>(u), time_diff);
diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h
index 725b309e3f1..725b309e3f1 100755..100644
--- a/src/server/game/Movement/MovementGeneratorImpl.h
+++ b/src/server/game/Movement/MovementGeneratorImpl.h
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
index a8b4d68c802..9ccb13c32ee 100755
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
@@ -57,7 +57,7 @@ void ConfusedMovementGenerator<T>::Reset(T* unit)
 }
 
 template<class T>
-bool ConfusedMovementGenerator<T>::Update(T* unit, const uint32& diff)
+bool ConfusedMovementGenerator<T>::Update(T* unit, uint32 diff)
 {
     if (unit->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED))
         return true;
@@ -125,6 +125,6 @@ template void ConfusedMovementGenerator<Player>::Initialize(Player*);
 template void ConfusedMovementGenerator<Creature>::Initialize(Creature*);
 template void ConfusedMovementGenerator<Player>::Reset(Player*);
 template void ConfusedMovementGenerator<Creature>::Reset(Creature*);
-template bool ConfusedMovementGenerator<Player>::Update(Player*, const uint32&);
-template bool ConfusedMovementGenerator<Creature>::Update(Creature*, const uint32&);
+template bool ConfusedMovementGenerator<Player>::Update(Player*, uint32 diff);
+template bool ConfusedMovementGenerator<Creature>::Update(Creature*, uint32 diff);
 
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
index 5b535e2d47d..22d9bcc1a07 100755
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
@@ -31,7 +31,7 @@ class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMov
         void Initialize(T*);
         void Finalize(T*);
         void Reset(T*);
-        bool Update(T*, const uint32&);
+        bool Update(T*, uint32);
 
         MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; }
     private:
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
index 3d75e384e93..7f9c7fac7e7 100644
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
@@ -136,7 +136,7 @@ void FleeingMovementGenerator<T>::Reset(T* owner)
 }
 
 template<class T>
-bool FleeingMovementGenerator<T>::Update(T* owner, const uint32& time_diff)
+bool FleeingMovementGenerator<T>::Update(T* owner, uint32 time_diff)
 {
     if (!owner || !owner->isAlive())
         return false;
@@ -162,8 +162,8 @@ template void FleeingMovementGenerator<Player>::_setTargetLocation(Player*);
 template void FleeingMovementGenerator<Creature>::_setTargetLocation(Creature*);
 template void FleeingMovementGenerator<Player>::Reset(Player*);
 template void FleeingMovementGenerator<Creature>::Reset(Creature*);
-template bool FleeingMovementGenerator<Player>::Update(Player*, const uint32&);
-template bool FleeingMovementGenerator<Creature>::Update(Creature*, const uint32&);
+template bool FleeingMovementGenerator<Player>::Update(Player*, uint32);
+template bool FleeingMovementGenerator<Creature>::Update(Creature*, uint32);
 
 void TimedFleeingMovementGenerator::Finalize(Unit* owner)
 {
@@ -179,7 +179,7 @@ void TimedFleeingMovementGenerator::Finalize(Unit* owner)
     }
 }
 
-bool TimedFleeingMovementGenerator::Update(Unit* owner, const uint32& time_diff)
+bool TimedFleeingMovementGenerator::Update(Unit* owner, uint32 time_diff)
 {
     if (!owner->isAlive())
         return false;
@@ -194,7 +194,7 @@ bool TimedFleeingMovementGenerator::Update(Unit* owner, const uint32& time_diff)
     if (i_totalFleeTime.Passed())
         return false;
 
-    // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version
+    // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, uint32) version
     // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly
     return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff);
 }
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
index ed1fe85a314..05c3916ea8a 100755
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
@@ -30,7 +30,7 @@ class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovem
         void Initialize(T*);
         void Finalize(T*);
         void Reset(T*);
-        bool Update(T*, const uint32&);
+        bool Update(T*, uint32);
 
         MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; }
 
@@ -50,7 +50,7 @@ class TimedFleeingMovementGenerator : public FleeingMovementGenerator<Creature>
             i_totalFleeTime(time) {}
 
         MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; }
-        bool Update(Unit*, const uint32&);
+        bool Update(Unit*, uint32);
         void Finalize(Unit*);
 
     private:
diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
index dfbea60d353..dfbea60d353 100755..100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
index 8ef9bd7697a..b33cddc6f6d 100755
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
@@ -48,7 +48,7 @@ void RotateMovementGenerator::Initialize(Unit* owner)
     owner->AttackStop();
 }
 
-bool RotateMovementGenerator::Update(Unit* owner, const uint32& diff)
+bool RotateMovementGenerator::Update(Unit* owner, uint32 diff)
 {
     float angle = owner->GetOrientation();
     if (m_direction == ROTATE_DIRECTION_LEFT)
@@ -89,7 +89,7 @@ void DistractMovementGenerator::Finalize(Unit* owner)
     owner->ClearUnitState(UNIT_STATE_DISTRACTED);
 }
 
-bool DistractMovementGenerator::Update(Unit* /*owner*/, const uint32& time_diff)
+bool DistractMovementGenerator::Update(Unit* /*owner*/, uint32 time_diff)
 {
     if (time_diff > m_timer)
         return false;
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
index 14287d871c9..4a2a5e35d22 100755
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
@@ -28,7 +28,7 @@ class IdleMovementGenerator : public MovementGenerator
         void Initialize(Unit*);
         void Finalize(Unit*) {  }
         void Reset(Unit*);
-        bool Update(Unit*, const uint32&) { return true; }
+        bool Update(Unit*, uint32) { return true; }
         MovementGeneratorType GetMovementGeneratorType() { return IDLE_MOTION_TYPE; }
 };
 
@@ -42,7 +42,7 @@ class RotateMovementGenerator : public MovementGenerator
         void Initialize(Unit*);
         void Finalize(Unit*);
         void Reset(Unit* owner) { Initialize(owner); }
-        bool Update(Unit*, const uint32&);
+        bool Update(Unit*, uint32);
         MovementGeneratorType GetMovementGeneratorType() { return ROTATE_MOTION_TYPE; }
 
     private:
@@ -58,7 +58,7 @@ class DistractMovementGenerator : public MovementGenerator
         void Initialize(Unit*);
         void Finalize(Unit*);
         void Reset(Unit* owner) { Initialize(owner); }
-        bool Update(Unit*, const uint32&);
+        bool Update(Unit*, uint32);
         MovementGeneratorType GetMovementGeneratorType() { return DISTRACT_MOTION_TYPE; }
 
     private:
diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
index c022de31869..5d70b1aac3a 100755
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
@@ -45,7 +45,7 @@ void PointMovementGenerator<T>::Initialize(T* unit)
 }
 
 template<class T>
-bool PointMovementGenerator<T>::Update(T* unit, const uint32& /*diff*/)
+bool PointMovementGenerator<T>::Update(T* unit, uint32 /*diff*/)
 {
     if (!unit)
         return false;
@@ -107,8 +107,8 @@ template void PointMovementGenerator<Player>::Finalize(Player*);
 template void PointMovementGenerator<Creature>::Finalize(Creature*);
 template void PointMovementGenerator<Player>::Reset(Player*);
 template void PointMovementGenerator<Creature>::Reset(Creature*);
-template bool PointMovementGenerator<Player>::Update(Player*, const uint32&);
-template bool PointMovementGenerator<Creature>::Update(Creature*, const uint32&);
+template bool PointMovementGenerator<Player>::Update(Player*, uint32);
+template bool PointMovementGenerator<Creature>::Update(Creature*, uint32);
 
 void AssistanceMovementGenerator::Finalize(Unit* unit)
 {
@@ -118,7 +118,7 @@ void AssistanceMovementGenerator::Finalize(Unit* unit)
         unit->GetMotionMaster()->MoveSeekAssistanceDistract(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY));
 }
 
-bool EffectMovementGenerator::Update(Unit* unit, const uint32&)
+bool EffectMovementGenerator::Update(Unit* unit, uint32)
 {
     return !unit->movespline->Finalized();
 }
diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
index e01ced758a3..c26ff94c3a4 100644
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
@@ -32,7 +32,7 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG
         void Initialize(T*);
         void Finalize(T*);
         void Reset(T*);
-        bool Update(T*, const uint32 &);
+        bool Update(T*, uint32);
 
         void MovementInform(T*);
 
@@ -67,7 +67,7 @@ class EffectMovementGenerator : public MovementGenerator
         void Initialize(Unit*) {}
         void Finalize(Unit*);
         void Reset(Unit*) {}
-        bool Update(Unit*, const uint32&);
+        bool Update(Unit*, uint32);
         MovementGeneratorType GetMovementGeneratorType() { return EFFECT_MOTION_TYPE; }
     private:
         uint32 m_Id;
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
index a9d3c404a87..a9d3c404a87 100755..100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
index ca370de6ac3..ca370de6ac3 100755..100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
index 45c7c7c9ab2..0cb46a11e2e 100755
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
@@ -104,7 +104,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool upd
 }
 
 template<class T, typename D>
-bool TargetedMovementGeneratorMedium<T,D>::Update(T* owner, const uint32& time_diff)
+bool TargetedMovementGeneratorMedium<T,D>::Update(T* owner, uint32 time_diff)
 {
     if (!i_target.isValid() || !i_target->IsInWorld())
         return false;
@@ -293,10 +293,10 @@ template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Play
 template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player*, bool);
 template void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature*, bool);
 template void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::_setTargetLocation(Creature*, bool);
-template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::Update(Player*, const uint32&);
-template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::Update(Player*, const uint32&);
-template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::Update(Creature*, const uint32&);
-template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::Update(Creature*, const uint32&);
+template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::Update(Player*, uint32);
+template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::Update(Player*, uint32);
+template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::Update(Creature*, uint32);
+template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::Update(Creature*, uint32);
 
 template void ChaseMovementGenerator<Player>::_reachTarget(Player*);
 template void ChaseMovementGenerator<Creature>::_reachTarget(Creature*);
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
index f293d5976af..987baa91133 100755
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
@@ -47,7 +47,7 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >,
         ~TargetedMovementGeneratorMedium() { delete i_path; }
 
     public:
-        bool Update(T*, const uint32 &);
+        bool Update(T*, uint32);
         Unit* GetTarget() const { return i_target.getTarget(); }
 
         void unitSpeedChanged() { i_recalculateTravel = true; }
@@ -114,4 +114,3 @@ class FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, Follow
 };
 
 #endif
-
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 22b2a2a450b..d3b63ed6331 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -130,7 +130,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
     return true;
 }
 
-bool WaypointMovementGenerator<Creature>::Update(Creature* creature, const uint32& diff)
+bool WaypointMovementGenerator<Creature>::Update(Creature* creature, uint32 diff)
 {
     // Waypoint movement can be switched on/off
     // This is quite handy for escort quests and other stuff
@@ -241,7 +241,7 @@ void FlightPathMovementGenerator::Reset(Player* player)
     init.Launch();
 }
 
-bool FlightPathMovementGenerator::Update(Player* player, const uint32& /*diff*/)
+bool FlightPathMovementGenerator::Update(Player* player, uint32 /*diff*/)
 {
     uint32 pointId = (uint32)player->movespline->currentPathIdx();
     if (pointId > i_currentNode)
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 5230fe3b0e3..bf3f6f4cae3 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -68,7 +68,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea
         void Initialize(Creature*);
         void Finalize(Creature*);
         void Reset(Creature*);
-        bool Update(Creature*, const uint32 &diff);
+        bool Update(Creature*, uint32 diff);
 
         void MovementInform(Creature*);
 
@@ -121,7 +121,7 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig
         void Initialize(Player*);
         void Reset(Player*);
         void Finalize(Player*);
-        bool Update(Player*, const uint32&);
+        bool Update(Player*, uint32);
         MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; }
 
         TaxiPathNodeList const& GetPath() { return *i_path; }
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp
index 1821a78d993..1e96cd00fd3 100644
--- a/src/server/game/Movement/Spline/MoveSpline.cpp
+++ b/src/server/game/Movement/Spline/MoveSpline.cpp
@@ -51,15 +51,15 @@ Location MoveSpline::ComputePosition() const
         if (splineflags.final_angle)
             c.orientation = facing.angle;
         else if (splineflags.final_point)
-            c.orientation = atan2(facing.f.y-c.y, facing.f.x-c.x);
+            c.orientation = atan2(facing.f.y - c.y, facing.f.x - c.x);
         //nothing to do for MoveSplineFlag::Final_Target flag
     }
     else
     {
-        if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed|MoveSplineFlag::Falling))
+        if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed | MoveSplineFlag::Falling))
         {
             Vector3 hermite;
-            spline.evaluate_derivative(point_Idx,u,hermite);
+            spline.evaluate_derivative(point_Idx, u, hermite);
             c.orientation = atan2(hermite.y, hermite.x);
         }
 
diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h
index ef5e4bce08b..edeff668e0c 100644
--- a/src/server/game/Movement/Spline/MoveSpline.h
+++ b/src/server/game/Movement/Spline/MoveSpline.h
@@ -41,7 +41,8 @@ namespace Movement
     {
     public:
         typedef Spline<int32> MySpline;
-        enum UpdateResult{
+        enum UpdateResult
+        {
             Result_None         = 0x01,
             Result_Arrived      = 0x02,
             Result_NextCycle    = 0x04,
@@ -70,26 +71,26 @@ namespace Movement
         void init_spline(const MoveSplineInitArgs& args);
     protected:
 
-        const MySpline::ControlArray& getPath() const { return spline.getPoints();}
+        const MySpline::ControlArray& getPath() const { return spline.getPoints(); }
         void computeParabolicElevation(float& el) const;
         void computeFallElevation(float& el) const;
 
         UpdateResult _updateState(int32& ms_time_diff);
-        int32 next_timestamp() const { return spline.length(point_Idx+1);}
-        int32 segment_time_elapsed() const { return next_timestamp()-time_passed;}
-        int32 timeElapsed() const { return Duration() - time_passed;}
-        int32 timePassed() const { return time_passed;}
+        int32 next_timestamp() const { return spline.length(point_Idx+1); }
+        int32 segment_time_elapsed() const { return next_timestamp()-time_passed; }
+        int32 Duration() const { return spline.length(); }
+        int32 timeElapsed() const { return Duration() - time_passed; }
+        int32 timePassed() const { return time_passed; }
 
     public:
-        const MySpline& _Spline() const { return spline;}
-        int32 _currentSplineIdx() const { return point_Idx;}
+        const MySpline& _Spline() const { return spline; }
+        int32 _currentSplineIdx() const { return point_Idx; }
         void _Finalize();
         void _Interrupt() { splineflags.done = true;}
 
     public:
-        int32 Duration() const { return spline.length();}
         void Initialize(const MoveSplineInitArgs&);
-        bool Initialized() const { return !spline.empty();}
+        bool Initialized() const { return !spline.empty(); }
 
         explicit MoveSpline();
 
@@ -111,11 +112,11 @@ namespace Movement
 
         Location ComputePosition() const;
 
-        uint32 GetId() const { return m_Id;}
+        uint32 GetId() const { return m_Id; }
         bool Finalized() const { return splineflags.done; }
-        bool isCyclic() const { return splineflags.cyclic;}
-        const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3();}
-        const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx+1) : Vector3();}
+        bool isCyclic() const { return splineflags.cyclic; }
+        const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3(); }
+        const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx+1) : Vector3(); }
         int32 currentPathIdx() const;
 
         bool onTransport;
diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
index a7262182391..f3f436c9d00 100644
--- a/src/server/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -33,7 +33,8 @@ namespace Movement
     class MoveSplineFlag
     {
     public:
-        enum eFlags{
+        enum eFlags
+        {
             None                = 0x00000000,
                                                         // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag
             Done                = 0x00000100,
@@ -73,8 +74,8 @@ namespace Movement
             Mask_Unused         = No_Spline|Enter_Cycle|Frozen|Unknown7|Unknown8|Unknown10|Unknown11|Unknown12|Unknown13
         };
 
-        inline uint32& raw() { return (uint32&)*this;}
-        inline const uint32& raw() const { return (const uint32&)*this;}
+        inline uint32& raw() { return (uint32&)*this; }
+        inline const uint32& raw() const { return (const uint32&)*this; }
 
         MoveSplineFlag() { raw() = 0; }
         MoveSplineFlag(uint32 f) { raw() = f; }
@@ -82,21 +83,21 @@ namespace Movement
 
         // Constant interface
 
-        bool isSmooth() const { return raw() & Mask_CatmullRom;}
-        bool isLinear() const { return !isSmooth();}
-        bool isFacing() const { return raw() & Mask_Final_Facing;}
+        bool isSmooth() const { return raw() & Mask_CatmullRom; }
+        bool isLinear() const { return !isSmooth(); }
+        bool isFacing() const { return raw() & Mask_Final_Facing; }
 
-        uint8 getAnimationId() const { return animId;}
-        bool hasAllFlags(uint32 f) const { return (raw() & f) == f;}
-        bool hasFlag(uint32 f) const { return (raw() & f) != 0;}
-        uint32 operator & (uint32 f) const { return (raw() & f);}
-        uint32 operator | (uint32 f) const { return (raw() | f);}
+        uint8 getAnimationId() const { return animId; }
+        bool hasAllFlags(uint32 f) const { return (raw() & f) == f; }
+        bool hasFlag(uint32 f) const { return (raw() & f) != 0; }
+        uint32 operator & (uint32 f) const { return (raw() & f); }
+        uint32 operator | (uint32 f) const { return (raw() | f); }
         std::string ToString() const;
 
         // Not constant interface
 
-        void operator &= (uint32 f) { raw() &= f;}
-        void operator |= (uint32 f) { raw() |= f;}
+        void operator &= (uint32 f) { raw() &= f; }
+        void operator |= (uint32 f) { raw() |= f; }
 
         void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic)) | Animation | anim; }
         void EnableParabolic() { raw() = (raw() & ~(Mask_Animations | Falling | Animation)) | Parabolic; }
@@ -109,31 +110,31 @@ namespace Movement
         void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; }
         void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; }
 
-        uint8 animId       : 8;
-        bool done          : 1;
-        bool falling       : 1;
-        bool no_spline     : 1;
-        bool parabolic     : 1;
-        bool walkmode      : 1;
-        bool flying        : 1;
-        bool orientationFixed : 1;
-        bool final_point   : 1;
-        bool final_target  : 1;
-        bool final_angle   : 1;
-        bool catmullrom    : 1;
-        bool cyclic        : 1;
-        bool enter_cycle   : 1;
-        bool animation     : 1;
-        bool frozen        : 1;
-        bool transportEnter: 1;
-        bool transportExit : 1;
-        bool unknown7      : 1;
-        bool unknown8      : 1;
+        uint8 animId              : 8;
+        bool done                : 1;
+        bool falling             : 1;
+        bool no_spline           : 1;
+        bool parabolic           : 1;
+        bool walkmode            : 1;
+        bool flying              : 1;
+        bool orientationFixed    : 1;
+        bool final_point         : 1;
+        bool final_target        : 1;
+        bool final_angle         : 1;
+        bool catmullrom          : 1;
+        bool cyclic              : 1;
+        bool enter_cycle         : 1;
+        bool animation           : 1;
+        bool frozen              : 1;
+        bool transportEnter      : 1;
+        bool transportExit       : 1;
+        bool unknown7            : 1;
+        bool unknown8            : 1;
         bool orientationInversed : 1;
-        bool unknown10     : 1;
-        bool unknown11     : 1;
-        bool unknown12     : 1;
-        bool unknown13     : 1;
+        bool unknown10           : 1;
+        bool unknown11           : 1;
+        bool unknown12           : 1;
+        bool unknown13           : 1;
     };
 #if defined( __GNUC__ )
 #pragma pack()
diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h
index 01c8a5b7e7b..d8fe21ad4e6 100644
--- a/src/server/game/Movement/Spline/MovementTypedefs.h
+++ b/src/server/game/Movement/Spline/MovementTypedefs.h
@@ -54,7 +54,7 @@ namespace Movement
     class counter
     {
     public:
-        counter() { init();}
+        counter() { init(); }
 
         void Increase()
         {
@@ -64,8 +64,8 @@ namespace Movement
                 ++m_counter;
         }
 
-        T NewId() { Increase(); return m_counter;}
-        T getCurrent() const { return m_counter;}
+        T NewId() { Increase(); return m_counter; }
+        T getCurrent() const { return m_counter; }
 
     private:
         void init() { m_counter = 0; }
diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
index f0ed01c4676..b69d4b39e19 100644
--- a/src/server/game/Movement/Spline/MovementUtil.cpp
+++ b/src/server/game/Movement/Spline/MovementUtil.cpp
@@ -26,31 +26,31 @@ namespace Movement
 
     /// Velocity bounds that makes fall speed limited
     float terminalVelocity = 60.148003f;
-    float terminalSavefallVelocity = 7.f;
+    float terminalSafefallVelocity = 7.0f;
 
-    const float terminal_length = float(terminalVelocity * terminalVelocity) / (2.f * gravity);
-    const float terminal_savefall_length = (terminalSavefallVelocity * terminalSavefallVelocity) / (2.f * gravity);
-    const float terminalFallTime = float(terminalVelocity/gravity); // the time that needed to reach terminalVelocity
+    const float terminal_length = float(terminalVelocity * terminalVelocity) / (2.0f * gravity);
+    const float terminal_safefall_length = (terminalSafefallVelocity * terminalSafefallVelocity) / (2.0f * gravity);
+    const float terminalFallTime = float(terminalVelocity / gravity); // the time that needed to reach terminalVelocity
 
     float computeFallTime(float path_length, bool isSafeFall)
     {
-        if (path_length < 0.f)
-            return 0.f;
+        if (path_length < 0.0f)
+            return 0.0f;
 
         float time;
-        if ( isSafeFall )
+        if (isSafeFall)
         {
-            if (path_length >= terminal_savefall_length)
-                time = (path_length - terminal_savefall_length)/terminalSavefallVelocity + terminalSavefallVelocity/gravity;
+            if (path_length >= terminal_safefall_length)
+                time = (path_length - terminal_safefall_length) / terminalSafefallVelocity + terminalSafefallVelocity / gravity;
             else
-                time = sqrtf(2.f * path_length/gravity);
+                time = sqrtf(2.0f * path_length / gravity);
         }
         else
         {
             if (path_length >= terminal_length)
-                time = (path_length - terminal_length)/terminalVelocity + terminalFallTime;
+                time = (path_length - terminal_length) / terminalVelocity + terminalFallTime;
             else
-                time = sqrtf(2.f * path_length/gravity);
+                time = sqrtf(2.0f * path_length / gravity);
         }
 
         return time;
@@ -61,20 +61,21 @@ namespace Movement
         float termVel;
         float result;
 
-        if ( isSafeFall )
-            termVel = terminalSavefallVelocity;
+        if (isSafeFall)
+            termVel = terminalSafefallVelocity;
         else
             termVel = terminalVelocity;
 
-        if ( start_velocity > termVel )
+        if (start_velocity > termVel)
             start_velocity = termVel;
 
         float terminal_time = terminalFallTime - start_velocity / gravity; // the time that needed to reach terminalVelocity
 
-        if ( t_passed > terminal_time )
+        if (t_passed > terminal_time)
         {
-            result = terminalVelocity*(t_passed - terminal_time) +
-                start_velocity*terminal_time + gravity*terminal_time*terminal_time*0.5f;
+            result = terminalVelocity * (t_passed - terminal_time) +
+                start_velocity * terminal_time +
+                gravity * terminal_time * terminal_time*0.5f;
         }
         else
             result = t_passed * (start_velocity + t_passed * gravity * 0.5f);
@@ -100,7 +101,7 @@ namespace Movement
 
     #define STR(x) #x
 
-    const char * g_MovementFlag_names[]=
+    char const* g_MovementFlag_names[] =
     {
         STR(Forward            ),// 0x00000001,
         STR(Backward           ),// 0x00000002,
@@ -135,25 +136,25 @@ namespace Movement
         STR(Safe_Fall          ),// 0x20000000,               // Active Rogue Safe Fall Spell (Passive)
         STR(Hover              ),// 0x40000000
         STR(Unknown13          ),// 0x80000000
-        STR(Unk1              ),
-        STR(Unk2              ),
-        STR(Unk3              ),
-        STR(Fullspeedturning  ),
-        STR(Fullspeedpitching ),
-        STR(Allow_Pitching    ),
-        STR(Unk4              ),
-        STR(Unk5              ),
-        STR(Unk6              ),
-        STR(Unk7              ),
-        STR(Interp_Move       ),
-        STR(Interp_Turning    ),
-        STR(Interp_Pitching   ),
-        STR(Unk8              ),
-        STR(Unk9              ),
-        STR(Unk10             ),
+        STR(Unk1               ),
+        STR(Unk2               ),
+        STR(Unk3               ),
+        STR(Fullspeedturning   ),
+        STR(Fullspeedpitching  ),
+        STR(Allow_Pitching     ),
+        STR(Unk4               ),
+        STR(Unk5               ),
+        STR(Unk6               ),
+        STR(Unk7               ),
+        STR(Interp_Move        ),
+        STR(Interp_Turning     ),
+        STR(Interp_Pitching    ),
+        STR(Unk8               ),
+        STR(Unk9               ),
+        STR(Unk10              ),
     };
 
-    const char * g_SplineFlag_names[32]=
+    char const* g_SplineFlag_names[32] =
     {
         STR(AnimBit1     ),// 0x00000001,
         STR(AnimBit2     ),// 0x00000002,
@@ -190,11 +191,11 @@ namespace Movement
     };
 
     template<class Flags, int N>
-    void print_flags(Flags t, const char* (&names)[N], std::string& str)
+    void print_flags(Flags t, char const* (&names)[N], std::string& str)
     {
         for (int i = 0; i < N; ++i)
         {
-            if ((t & (Flags)(1 << i)) && names[i] != NULL)
+            if ((t & Flags(1 << i)) && names[i] != NULL)
                 str.append(" ").append(names[i]);
         }
     }
@@ -202,7 +203,7 @@ namespace Movement
     std::string MoveSplineFlag::ToString() const
     {
         std::string str;
-        print_flags(raw(),g_SplineFlag_names,str);
+        print_flags(raw(), g_SplineFlag_names, str);
         return str;
     }
 }
diff --git a/src/server/game/Movement/Waypoints/Path.h b/src/server/game/Movement/Waypoints/Path.h
index 038958593fb..038958593fb 100755..100644
--- a/src/server/game/Movement/Waypoints/Path.h
+++ b/src/server/game/Movement/Waypoints/Path.h
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index a01e18347f6..a01e18347f6 100755..100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
index df20c513c90..df20c513c90 100755..100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h