diff options
| author | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
| commit | 9f0f239e60e2c7f0b8d36d1984f459102022164e (patch) | |
| tree | 45e7629371e903fdd429a1bf449c9c53bf46d9ec /src/game/WaypointMovementGenerator.cpp | |
| parent | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (diff) | |
| parent | f303ee08c5888170ad1509b89413af1e2a321f5c (diff) | |
*Merge.
*Also fix build in VC7 and VC8.
--HG--
branch : trunk
Diffstat (limited to 'src/game/WaypointMovementGenerator.cpp')
| -rw-r--r-- | src/game/WaypointMovementGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 397b4adadab..6aba7def916 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -151,7 +151,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) Traveller<Creature> traveller(unit); i_nextMoveTime.Update(diff); - i_destinationHolder.UpdateTraveller(traveller, diff, false, true); + i_destinationHolder.UpdateTraveller(traveller, diff, true); if(i_nextMoveTime.Passed()) { @@ -291,7 +291,7 @@ FlightPathMovementGenerator::Update(Player &player, const uint32 &diff) if( MovementInProgress() ) { Traveller<Player> traveller(player); - if( i_destinationHolder.UpdateTraveller(traveller, diff, false) ) + if( i_destinationHolder.UpdateTraveller(traveller, diff) ) { i_destinationHolder.ResetUpdate(FLIGHT_TRAVEL_UPDATE); if( i_destinationHolder.HasArrived() ) |