diff options
author | megamage <none@none> | 2009-08-07 14:41:48 -0500 |
---|---|---|
committer | megamage <none@none> | 2009-08-07 14:41:48 -0500 |
commit | 8c67a6a697e30696e9881935f51e4f12f4325e01 (patch) | |
tree | 15fd2e1f24f004d4c16e4c52f40dd8d16b74c6e3 /src/game/TargetedMovementGenerator.cpp | |
parent | 3549c0bddd7b170bf3717f5d2aae9de1dcab9060 (diff) | |
parent | 6fe8d1269d238d8502c65a1d139b6f54de5fbf2b (diff) |
merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/TargetedMovementGenerator.cpp')
-rw-r--r-- | src/game/TargetedMovementGenerator.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index da7b5cc41fe..c1c601921b3 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -205,9 +205,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff) return true; } - bool update_traveller = (owner.GetTypeId() == TYPEID_UNIT && !((Creature*)&owner)->isPet())? i_destinationHolder.UpdateTraveller(traveller, time_diff, true) : i_destinationHolder.UpdateTraveller(traveller, time_diff, false); - //if (i_destinationHolder.UpdateTraveller(traveller, time_diff)) - if(update_traveller) + if (i_destinationHolder.UpdateTraveller(traveller, time_diff)) { // put targeted movement generators on a higher priority //if (owner.GetObjectSize()) |