diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:58:39 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:58:39 +0100 |
commit | 306e4c173c2a2c050af61f8eb511c67496621a60 (patch) | |
tree | 60c3f537da2054a1e5b1bad697984a9e4c5b72b0 /src | |
parent | 36b3e06a7e2ffc5bddebd8a749cb0743a841fcaf (diff) |
Fix a merge failure
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 029bc55ab58..acb1a57a9ba 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -47,11 +47,6 @@ void FleeingMovementGenerator<T>::_setTargetLocation(T* owner) path.setPathLengthLimit(30.0f); path.CalculatePath(x, y, z); if (path.getPathType() & PATHFIND_NOPATH) - default: - angle = 0.0f; - distance = 0.0f; - break; - { i_nextCheckTime.Reset(urand(1000, 1500)); return; |