review all initialize/reset handling for all generators

Author: ccrs

src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp

@@ -82,7 +82,7 @@ bool ChaseMovementGenerator::Initialize(Unit* /*owner*/)
 
     _path = nullptr;
     _lastTargetPosition.reset();
-    return true;
+    return false;
 }
 
 bool ChaseMovementGenerator::Reset(Unit* owner)

src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp

@@ -50,12 +50,11 @@ bool ConfusedMovementGenerator<T>::DoInitialize(T* owner)
 
     // TODO: UNIT_FIELD_FLAGS should not be handled by generators
     owner->SetUnitFlag(UNIT_FLAG_CONFUSED);
-    owner->StopMoving();
 
     _timer.Reset(0);
     owner->GetPosition(_x, _y, _z);
     _path = nullptr;
-    return true;
+    return false;
 }
 
 template<class T>

src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp

@@ -57,11 +57,10 @@ bool FollowMovementGenerator::Initialize(Unit* owner)
     RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING | MOVEMENTGENERATOR_FLAG_DEACTIVATED);
     AddFlag(MOVEMENTGENERATOR_FLAG_INITIALIZED | MOVEMENTGENERATOR_FLAG_INFORM_ENABLED);
 
-    owner->StopMoving();
     UpdatePetSpeed(owner);
     _path = nullptr;
     _lastTargetPosition.reset();
-    return true;
+    return false;
 }
 
 bool FollowMovementGenerator::Reset(Unit* owner)

src/server/game/Movement/MovementGenerators/FormationMovementGenerator.cpp

@@ -51,7 +51,7 @@ bool FormationMovementGenerator::DoInitialize(Creature* owner)
     }
 
     _nextMoveTimer.Reset(0);
-    return true;
+    return false;
 }
 
 bool FormationMovementGenerator::DoReset(Creature* owner)

src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp

@@ -36,7 +36,7 @@ bool GenericMovementGenerator::Initialize(Unit* owner)
     {
         RemoveFlag(MOVEMENTGENERATOR_FLAG_DEACTIVATED);
         AddFlag(MOVEMENTGENERATOR_FLAG_FINALIZED);
-        return false;
+        return true;
     }
 
     RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING | MOVEMENTGENERATOR_FLAG_DEACTIVATED);

src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp

@@ -81,7 +81,7 @@ void HomeMovementGenerator<Creature>::SetTargetLocation(Creature* owner)
 }
 
 template<class T>
-bool HomeMovementGenerator<T>::DoInitialize(T*) { }
+bool HomeMovementGenerator<T>::DoInitialize(T*) { return false; }
 
 template<>
 bool HomeMovementGenerator<Creature>::DoInitialize(Creature* owner)
@@ -96,7 +96,7 @@ bool HomeMovementGenerator<Creature>::DoInitialize(Creature* owner)
 }
 
 template<class T>
-bool HomeMovementGenerator<T>::DoReset(T*) { }
+bool HomeMovementGenerator<T>::DoReset(T*) { return false; }
 
 template<>
 bool HomeMovementGenerator<Creature>::DoReset(Creature* owner)

src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp

@@ -77,8 +77,7 @@ bool RotateMovementGenerator::Initialize(Unit* owner)
     RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING | MOVEMENTGENERATOR_FLAG_DEACTIVATED);
     AddFlag(MOVEMENTGENERATOR_FLAG_INITIALIZED);
 
-    owner->StopMoving();
-    return true;
+    return false;
     /*
      *  TODO: This code should be handled somewhere else, like MovementInform
      *

src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp

@@ -69,7 +69,7 @@ void RandomMovementGenerator<T>::Resume(uint32 overrideTimer /*= 0*/)
 template MovementGeneratorType RandomMovementGenerator<Creature>::GetMovementGeneratorType() const;
 
 template<class T>
-bool RandomMovementGenerator<T>::DoInitialize(T*) { }
+bool RandomMovementGenerator<T>::DoInitialize(T*) { return false; }
 
 template<>
 bool RandomMovementGenerator<Creature>::DoInitialize(Creature* owner)
@@ -81,7 +81,6 @@ bool RandomMovementGenerator<Creature>::DoInitialize(Creature* owner)
         return false;
 
     _reference = owner->GetPosition();
-    owner->StopMoving();
 
     if (_wanderDistance == 0.f)
         _wanderDistance = owner->GetWanderDistance();
@@ -91,11 +90,11 @@ bool RandomMovementGenerator<Creature>::DoInitialize(Creature* owner)
 
     _timer.Reset(0);
     _path = nullptr;
-    return true;
+    return false;
 }
 
 template<class T>
-bool RandomMovementGenerator<T>::DoReset(T*) { }
+bool RandomMovementGenerator<T>::DoReset(T*) { return false; }
 
 template<>
 bool RandomMovementGenerator<Creature>::DoReset(Creature* owner)

src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp

@@ -96,13 +96,13 @@ bool SplineChainMovementGenerator::Initialize(Unit* owner)
     {
         TC_LOG_WARN("movement", "SplineChainMovementGenerator::Initialize: couldn't initialize generator, _nextIndex is >= _chainSize ({})", owner->GetGUID().ToString());
         _msToNext = 0;
-        return true;
+        return false;
     }
 
     if (_nextFirstWP) // this is a resumed movegen that has to start with a partial spline
     {
         if (HasFlag(MOVEMENTGENERATOR_FLAG_FINALIZED))
-            return true;
+            return false;
 
         SplineChainLink const& thisLink = _chain[_nextIndex];
         if (_nextFirstWP >= thisLink.Points.size())
@@ -126,6 +126,7 @@ bool SplineChainMovementGenerator::Initialize(Unit* owner)
     }
     else
     {
+        owner->AddUnitState(UNIT_STATE_ROAMING_MOVE);
         _msToNext = std::max(_chain[_nextIndex].TimeToNext, 1u);
         SendSplineFor(owner, _nextIndex, _msToNext);
 
@@ -146,7 +147,7 @@ bool SplineChainMovementGenerator::Reset(Unit* owner)
 
 bool SplineChainMovementGenerator::Update(Unit* owner, uint32 diff)
 {
-    if (!owner || HasFlag(MOVEMENTGENERATOR_FLAG_FINALIZED))
+    if (!owner || !_chainSize || HasFlag(MOVEMENTGENERATOR_FLAG_FINALIZED))
         return false;
 
     // _msToNext being zero here means we're on the final spline