diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-01-22 13:13:41 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-01-22 13:13:41 +0100 |
commit | a65caa6da2d6090ca23018706029f3a96a035b55 (patch) | |
tree | bc3a97f9407a3b63a080e8d30fec67cf43bbb94e /src | |
parent | 4b4b637081ae120c8faa9c95f872f7100f32a7d9 (diff) |
Core/Movement: Fixed one (probably many remain) merge error
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 3a8841848d1..abb4ac9964b 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -107,10 +107,6 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool upd Movement::MoveSplineInit init(owner); init.MovebyPath(i_path->GetPath()); - if (forceDest && updateDestination) - init.SetFacing(i_target.getTarget()->GetOrientation()); - else - init.SetFacing(i_target.getTarget()); init.SetWalk(((D*)this)->EnableWalking()); // Using the same condition for facing target as the one that is used for SetInFront on movement end // - applies to ChaseMovementGenerator mostly |