Fixes waypoints: No pause between every waypoint. This makes waypoints a bit smoother.

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index d2e4c515a04..2a0c7c0253d 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -155,7 +155,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
     i_nextMoveTime.Update(diff);
     i_destinationHolder.UpdateTraveller(traveller, diff, true);
 
-    if (i_nextMoveTime.Passed())
+    if (i_nextMoveTime.GetExpiry() < TIMEDIFF_NEXT_WP)
     {
         if (unit.IsStopped())
         {
@@ -202,6 +202,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
             if (node->event_id && urand(0,99) < node->event_chance)
                 unit.GetMap()->ScriptsStart(sWaypointScripts, node->event_id, &unit, NULL/*, false*/);
 
+            i_destinationHolder.ResetTravelTime();
             MovementInform(unit);
             unit.UpdateWaypointID(i_currentNode);
             unit.clearUnitState(UNIT_STAT_ROAMING);