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/RandomMovementGenerator.cpp | |
| parent | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (diff) | |
| parent | f303ee08c5888170ad1509b89413af1e2a321f5c (diff) | |
*Merge.
*Also fix build in VC7 and VC8.
--HG--
branch : trunk
Diffstat (limited to 'src/game/RandomMovementGenerator.cpp')
| -rw-r--r-- | src/game/RandomMovementGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index 0081c702abd..6d147f15b8d 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -164,14 +164,14 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff i_nextMoveTime.Update(diff); if(i_destinationHolder.HasArrived() && !creature.IsStopped() && !creature.canFly()) - creature.clearUnitState(UNIT_STAT_ROAMING); + creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_MOVE); if(!i_destinationHolder.HasArrived() && creature.IsStopped()) creature.addUnitState(UNIT_STAT_ROAMING); CreatureTraveller traveller(creature); - if( i_destinationHolder.UpdateTraveller(traveller, diff, false, true) ) + if( i_destinationHolder.UpdateTraveller(traveller, diff, true) ) { if(i_nextMoveTime.Passed()) { |