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/ConfusedMovementGenerator.cpp | |
| parent | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (diff) | |
| parent | f303ee08c5888170ad1509b89413af1e2a321f5c (diff) | |
*Merge.
*Also fix build in VC7 and VC8.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ConfusedMovementGenerator.cpp')
| -rw-r--r-- | src/game/ConfusedMovementGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp index bbb0b9ebc6a..da383cc8a07 100644 --- a/src/game/ConfusedMovementGenerator.cpp +++ b/src/game/ConfusedMovementGenerator.cpp @@ -114,12 +114,12 @@ ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff) { // currently moving, update location Traveller<T> traveller(unit); - if( i_destinationHolder.UpdateTraveller(traveller, diff, false)) + if( i_destinationHolder.UpdateTraveller(traveller, diff)) { if( i_destinationHolder.HasArrived()) { // arrived, stop and wait a bit - unit.StopMoving(); + unit.clearUnitState(UNIT_STAT_MOVE); i_nextMove = urand(1,MAX_CONF_WAYPOINTS); i_nextMoveTime.Reset(urand(0, 1500-1)); // TODO: check the minimum reset time, should be probably higher |