diff options
Diffstat (limited to 'src')
24 files changed, 119 insertions, 143 deletions
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h index 5066804d60f..48292efc016 100644 --- a/src/server/game/Movement/FollowerRefManager.h +++ b/src/server/game/Movement/FollowerRefManager.h @@ -29,4 +29,3 @@ class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase }; #endif - diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp index 997d066a9f2..514bc625251 100644 --- a/src/server/game/Movement/FollowerReference.cpp +++ b/src/server/game/Movement/FollowerReference.cpp @@ -34,4 +34,3 @@ void FollowerReference::sourceObjectDestroyLink() { getSource()->stopFollowing(); } - diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h index 6a1a3719cb8..647662eb066 100644 --- a/src/server/game/Movement/FollowerReference.h +++ b/src/server/game/Movement/FollowerReference.h @@ -32,4 +32,3 @@ class FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase> void sourceObjectDestroyLink(); }; #endif - diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index b0676e02f51..f908b096455 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -201,4 +201,3 @@ class MotionMaster //: private std::stack<MovementGenerator *> uint8 _cleanFlag; }; #endif - diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 43d03160a41..b84899d9b12 100755 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -55,32 +55,26 @@ class MovementGeneratorMedium : public MovementGenerator void Initialize(Unit* u) { //u->AssertIsType<T>(); - (static_cast<D*>(this))->Initialize(static_cast<T*>(u)); + (static_cast<D*>(this))->DoInitialize(static_cast<T*>(u)); } void Finalize(Unit* u) { //u->AssertIsType<T>(); - (static_cast<D*>(this))->Finalize(static_cast<T*>(u)); + (static_cast<D*>(this))->DoFinalize(static_cast<T*>(u)); } void Reset(Unit* u) { //u->AssertIsType<T>(); - (static_cast<D*>(this))->Reset(static_cast<T*>(u)); + (static_cast<D*>(this))->DoReset(static_cast<T*>(u)); } bool Update(Unit* u, uint32 time_diff) { //u->AssertIsType<T>(); - return (static_cast<D*>(this))->Update(static_cast<T*>(u), time_diff); + return (static_cast<D*>(this))->DoUpdate(static_cast<T*>(u), time_diff); } - public: - // will not link if not overridden in the generators - void Initialize(T* u); - void Finalize(T* u); - void Reset(T* u); - bool Update(T* u, const uint32& time_diff); }; struct SelectableMovement : public FactoryHolder<MovementGenerator, MovementGeneratorType> @@ -100,4 +94,3 @@ typedef FactoryHolder<MovementGenerator, MovementGeneratorType> MovementGenerato typedef FactoryHolder<MovementGenerator, MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; typedef FactoryHolder<MovementGenerator, MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; #endif - diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h index 725b309e3f1..8d9c170bce8 100644 --- a/src/server/game/Movement/MovementGeneratorImpl.h +++ b/src/server/game/Movement/MovementGeneratorImpl.h @@ -28,4 +28,3 @@ MovementGeneratorFactory<MOVEMENT_GEN>::Create(void * /*data*/) const return (new MOVEMENT_GEN()); } #endif - diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 9ccb13c32ee..e1893d499ca 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -31,7 +31,7 @@ #endif template<class T> -void ConfusedMovementGenerator<T>::Initialize(T* unit) +void ConfusedMovementGenerator<T>::DoInitialize(T* unit) { unit->AddUnitState(UNIT_STATE_CONFUSED); unit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); @@ -45,7 +45,7 @@ void ConfusedMovementGenerator<T>::Initialize(T* unit) } template<class T> -void ConfusedMovementGenerator<T>::Reset(T* unit) +void ConfusedMovementGenerator<T>::DoReset(T* unit) { i_nextMoveTime.Reset(0); @@ -57,7 +57,7 @@ void ConfusedMovementGenerator<T>::Reset(T* unit) } template<class T> -bool ConfusedMovementGenerator<T>::Update(T* unit, uint32 diff) +bool ConfusedMovementGenerator<T>::DoUpdate(T* unit, uint32 diff) { if (unit->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED)) return true; @@ -105,7 +105,7 @@ bool ConfusedMovementGenerator<T>::Update(T* unit, uint32 diff) } template<> -void ConfusedMovementGenerator<Player>::Finalize(Player* unit) +void ConfusedMovementGenerator<Player>::DoFinalize(Player* unit) { unit->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); unit->ClearUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_CONFUSED_MOVE); @@ -113,7 +113,7 @@ void ConfusedMovementGenerator<Player>::Finalize(Player* unit) } template<> -void ConfusedMovementGenerator<Creature>::Finalize(Creature* unit) +void ConfusedMovementGenerator<Creature>::DoFinalize(Creature* unit) { unit->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); unit->ClearUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_CONFUSED_MOVE); @@ -121,10 +121,9 @@ void ConfusedMovementGenerator<Creature>::Finalize(Creature* unit) unit->SetTarget(unit->getVictim()->GetGUID()); } -template void ConfusedMovementGenerator<Player>::Initialize(Player*); -template void ConfusedMovementGenerator<Creature>::Initialize(Creature*); -template void ConfusedMovementGenerator<Player>::Reset(Player*); -template void ConfusedMovementGenerator<Creature>::Reset(Creature*); -template bool ConfusedMovementGenerator<Player>::Update(Player*, uint32 diff); -template bool ConfusedMovementGenerator<Creature>::Update(Creature*, uint32 diff); - +template void ConfusedMovementGenerator<Player>::DoInitialize(Player*); +template void ConfusedMovementGenerator<Creature>::DoInitialize(Creature*); +template void ConfusedMovementGenerator<Player>::DoReset(Player*); +template void ConfusedMovementGenerator<Creature>::DoReset(Creature*); +template bool ConfusedMovementGenerator<Player>::DoUpdate(Player*, uint32 diff); +template bool ConfusedMovementGenerator<Creature>::DoUpdate(Creature*, uint32 diff); diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h index 22d9bcc1a07..dd130961ed8 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -28,10 +28,10 @@ class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMov public: explicit ConfusedMovementGenerator() : i_nextMoveTime(0) {} - void Initialize(T*); - void Finalize(T*); - void Reset(T*); - bool Update(T*, uint32); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); + bool DoUpdate(T*, uint32); MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; } private: @@ -39,4 +39,3 @@ class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMov float i_x, i_y, i_z; }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 7f9c7fac7e7..14215d22ad1 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -102,7 +102,7 @@ void FleeingMovementGenerator<T>::_getPoint(T* owner, float &x, float &y, float } template<class T> -void FleeingMovementGenerator<T>::Initialize(T* owner) +void FleeingMovementGenerator<T>::DoInitialize(T* owner) { if (!owner) return; @@ -113,7 +113,7 @@ void FleeingMovementGenerator<T>::Initialize(T* owner) } template<> -void FleeingMovementGenerator<Player>::Finalize(Player* owner) +void FleeingMovementGenerator<Player>::DoFinalize(Player* owner) { owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); owner->ClearUnitState(UNIT_STATE_FLEEING | UNIT_STATE_FLEEING_MOVE); @@ -121,7 +121,7 @@ void FleeingMovementGenerator<Player>::Finalize(Player* owner) } template<> -void FleeingMovementGenerator<Creature>::Finalize(Creature* owner) +void FleeingMovementGenerator<Creature>::DoFinalize(Creature* owner) { owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); owner->ClearUnitState(UNIT_STATE_FLEEING|UNIT_STATE_FLEEING_MOVE); @@ -130,13 +130,13 @@ void FleeingMovementGenerator<Creature>::Finalize(Creature* owner) } template<class T> -void FleeingMovementGenerator<T>::Reset(T* owner) +void FleeingMovementGenerator<T>::DoReset(T* owner) { - Initialize(owner); + DoInitialize(owner); } template<class T> -bool FleeingMovementGenerator<T>::Update(T* owner, uint32 time_diff) +bool FleeingMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff) { if (!owner || !owner->isAlive()) return false; @@ -154,16 +154,16 @@ bool FleeingMovementGenerator<T>::Update(T* owner, uint32 time_diff) return true; } -template void FleeingMovementGenerator<Player>::Initialize(Player*); -template void FleeingMovementGenerator<Creature>::Initialize(Creature*); +template void FleeingMovementGenerator<Player>::DoInitialize(Player*); +template void FleeingMovementGenerator<Creature>::DoInitialize(Creature*); template void FleeingMovementGenerator<Player>::_getPoint(Player*, float&, float&, float&); template void FleeingMovementGenerator<Creature>::_getPoint(Creature*, float&, float&, float&); template void FleeingMovementGenerator<Player>::_setTargetLocation(Player*); template void FleeingMovementGenerator<Creature>::_setTargetLocation(Creature*); -template void FleeingMovementGenerator<Player>::Reset(Player*); -template void FleeingMovementGenerator<Creature>::Reset(Creature*); -template bool FleeingMovementGenerator<Player>::Update(Player*, uint32); -template bool FleeingMovementGenerator<Creature>::Update(Creature*, uint32); +template void FleeingMovementGenerator<Player>::DoReset(Player*); +template void FleeingMovementGenerator<Creature>::DoReset(Creature*); +template bool FleeingMovementGenerator<Player>::DoUpdate(Player*, uint32); +template bool FleeingMovementGenerator<Creature>::DoUpdate(Creature*, uint32); void TimedFleeingMovementGenerator::Finalize(Unit* owner) { @@ -198,4 +198,3 @@ bool TimedFleeingMovementGenerator::Update(Unit* owner, uint32 time_diff) // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff); } - diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h index 05c3916ea8a..245c53513f3 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h @@ -27,10 +27,10 @@ class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovem public: FleeingMovementGenerator(uint64 fright) : i_frightGUID(fright), i_nextCheckTime(0) {} - void Initialize(T*); - void Finalize(T*); - void Reset(T*); - bool Update(T*, uint32); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); + bool DoUpdate(T*, uint32); MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; } @@ -58,4 +58,3 @@ class TimedFleeingMovementGenerator : public FleeingMovementGenerator<Creature> }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 78c1f80005c..f52120b6999 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -23,12 +23,12 @@ #include "MoveSplineInit.h" #include "MoveSpline.h" -void HomeMovementGenerator<Creature>::Initialize(Creature* owner) +void HomeMovementGenerator<Creature>::DoInitialize(Creature* owner) { _setTargetLocation(owner); } -void HomeMovementGenerator<Creature>::Finalize(Creature* owner) +void HomeMovementGenerator<Creature>::DoFinalize(Creature* owner) { if (arrived) { @@ -39,7 +39,7 @@ void HomeMovementGenerator<Creature>::Finalize(Creature* owner) } } -void HomeMovementGenerator<Creature>::Reset(Creature*) +void HomeMovementGenerator<Creature>::DoReset(Creature*) { } @@ -64,7 +64,7 @@ void HomeMovementGenerator<Creature>::_setTargetLocation(Creature* owner) owner->ClearUnitState(UNIT_STATE_ALL_STATE & ~UNIT_STATE_EVADE); } -bool HomeMovementGenerator<Creature>::Update(Creature* owner, const uint32 /*time_diff*/) +bool HomeMovementGenerator<Creature>::DoUpdate(Creature* owner, const uint32 /*time_diff*/) { arrived = owner->movespline->Finalized(); return !arrived; diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index dfbea60d353..5217f14f75a 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -34,10 +34,10 @@ class HomeMovementGenerator<Creature> : public MovementGeneratorMedium< Creature HomeMovementGenerator() : arrived(false) {} ~HomeMovementGenerator() {} - void Initialize(Creature*); - void Finalize(Creature*); - void Reset(Creature*); - bool Update(Creature*, const uint32); + void DoInitialize(Creature*); + void DoFinalize(Creature*); + void DoReset(Creature*); + bool DoUpdate(Creature*, const uint32); MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; } private: @@ -45,4 +45,3 @@ class HomeMovementGenerator<Creature> : public MovementGeneratorMedium< Creature bool arrived; }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index b33cddc6f6d..080ae1b5b89 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -103,4 +103,3 @@ void AssistanceDistractMovementGenerator::Finalize(Unit* unit) unit->ClearUnitState(UNIT_STATE_DISTRACTED); unit->ToCreature()->SetReactState(REACT_AGGRESSIVE); } - diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 4a2a5e35d22..7be70990b22 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -76,4 +76,3 @@ class AssistanceDistractMovementGenerator : public DistractMovementGenerator }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 5d70b1aac3a..e7b61e30ea8 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -27,7 +27,7 @@ //----- Point Movement Generator template<class T> -void PointMovementGenerator<T>::Initialize(T* unit) +void PointMovementGenerator<T>::DoInitialize(T* unit) { if (!unit->IsStopped()) unit->StopMoving(); @@ -45,7 +45,7 @@ void PointMovementGenerator<T>::Initialize(T* unit) } template<class T> -bool PointMovementGenerator<T>::Update(T* unit, uint32 /*diff*/) +bool PointMovementGenerator<T>::DoUpdate(T* unit, uint32 /*diff*/) { if (!unit) return false; @@ -72,7 +72,7 @@ bool PointMovementGenerator<T>::Update(T* unit, uint32 /*diff*/) } template<class T> -void PointMovementGenerator<T>::Finalize(T* unit) +void PointMovementGenerator<T>::DoFinalize(T* unit) { if (unit->HasUnitState(UNIT_STATE_CHARGING)) unit->ClearUnitState(UNIT_STATE_ROAMING | UNIT_STATE_ROAMING_MOVE); @@ -82,7 +82,7 @@ void PointMovementGenerator<T>::Finalize(T* unit) } template<class T> -void PointMovementGenerator<T>::Reset(T* unit) +void PointMovementGenerator<T>::DoReset(T* unit) { if (!unit->IsStopped()) unit->StopMoving(); @@ -101,14 +101,14 @@ template <> void PointMovementGenerator<Creature>::MovementInform(Creature* unit unit->AI()->MovementInform(POINT_MOTION_TYPE, id); } -template void PointMovementGenerator<Player>::Initialize(Player*); -template void PointMovementGenerator<Creature>::Initialize(Creature*); -template void PointMovementGenerator<Player>::Finalize(Player*); -template void PointMovementGenerator<Creature>::Finalize(Creature*); -template void PointMovementGenerator<Player>::Reset(Player*); -template void PointMovementGenerator<Creature>::Reset(Creature*); -template bool PointMovementGenerator<Player>::Update(Player*, uint32); -template bool PointMovementGenerator<Creature>::Update(Creature*, uint32); +template void PointMovementGenerator<Player>::DoInitialize(Player*); +template void PointMovementGenerator<Creature>::DoInitialize(Creature*); +template void PointMovementGenerator<Player>::DoFinalize(Player*); +template void PointMovementGenerator<Creature>::DoFinalize(Creature*); +template void PointMovementGenerator<Player>::DoReset(Player*); +template void PointMovementGenerator<Creature>::DoReset(Creature*); +template bool PointMovementGenerator<Player>::DoUpdate(Player*, uint32); +template bool PointMovementGenerator<Creature>::DoUpdate(Creature*, uint32); void AssistanceMovementGenerator::Finalize(Unit* unit) { diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index c26ff94c3a4..592fc7bc517 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -29,10 +29,10 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG PointMovementGenerator(uint32 _id, float _x, float _y, float _z, bool _generatePath, float _speed = 0.0f) : id(_id), i_x(_x), i_y(_y), i_z(_z), m_generatePath(_generatePath), speed(_speed), i_recalculateSpeed(false) {} - void Initialize(T*); - void Finalize(T*); - void Reset(T*); - bool Update(T*, uint32); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); + bool DoUpdate(T*, uint32); void MovementInform(T*); @@ -74,4 +74,3 @@ class EffectMovementGenerator : public MovementGenerator }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index a9d3c404a87..5b8bc6552d3 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -114,7 +114,7 @@ void RandomMovementGenerator<Creature>::_setRandomLocation(Creature* creature) } template<> -void RandomMovementGenerator<Creature>::Initialize(Creature* creature) +void RandomMovementGenerator<Creature>::DoInitialize(Creature* creature) { if (!creature->isAlive()) return; @@ -127,20 +127,20 @@ void RandomMovementGenerator<Creature>::Initialize(Creature* creature) } template<> -void RandomMovementGenerator<Creature>::Reset(Creature* creature) +void RandomMovementGenerator<Creature>::DoReset(Creature* creature) { - Initialize(creature); + DoInitialize(creature); } template<> -void RandomMovementGenerator<Creature>::Finalize(Creature* creature) +void RandomMovementGenerator<Creature>::DoFinalize(Creature* creature) { creature->ClearUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE); creature->SetWalk(false); } template<> -bool RandomMovementGenerator<Creature>::Update(Creature* creature, const uint32 diff) +bool RandomMovementGenerator<Creature>::DoUpdate(Creature* creature, const uint32 diff) { if (creature->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED)) { @@ -159,7 +159,7 @@ bool RandomMovementGenerator<Creature>::Update(Creature* creature, const uint32 } template<> -bool RandomMovementGenerator<Creature>::GetResetPosition(Creature* creature, float& x, float& y, float& z) +bool RandomMovementGenerator<Creature>::GetResetPos(Creature* creature, float& x, float& y, float& z) { float radius; creature->GetRespawnPosition(x, y, z, NULL, &radius); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index ca370de6ac3..80379dee632 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -28,11 +28,11 @@ class RandomMovementGenerator : public MovementGeneratorMedium< T, RandomMovemen RandomMovementGenerator(float spawn_dist = 0.0f) : i_nextMoveTime(0), wander_distance(spawn_dist) {} void _setRandomLocation(T*); - void Initialize(T*); - void Finalize(T*); - void Reset(T*); - bool Update(T*, const uint32); - bool GetResetPosition(T*, float& x, float& y, float& z); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); + bool DoUpdate(T*, const uint32); + bool GetResetPos(T*, float& x, float& y, float& z); MovementGeneratorType GetMovementGeneratorType() { return RANDOM_MOTION_TYPE; } private: TimeTrackerSmall i_nextMoveTime; @@ -41,4 +41,3 @@ class RandomMovementGenerator : public MovementGeneratorMedium< T, RandomMovemen float wander_distance; }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 88eacccd0aa..46db6b034c4 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -116,7 +116,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool upd } template<class T, typename D> -bool TargetedMovementGeneratorMedium<T,D>::Update(T* owner, uint32 time_diff) +bool TargetedMovementGeneratorMedium<T,D>::DoUpdate(T* owner, uint32 time_diff) { if (!i_target.isValid() || !i_target->IsInWorld()) return false; @@ -188,14 +188,14 @@ void ChaseMovementGenerator<T>::_reachTarget(T* owner) } template<> -void ChaseMovementGenerator<Player>::Initialize(Player* owner) +void ChaseMovementGenerator<Player>::DoInitialize(Player* owner) { owner->AddUnitState(UNIT_STATE_CHASE | UNIT_STATE_CHASE_MOVE); _setTargetLocation(owner, true); } template<> -void ChaseMovementGenerator<Creature>::Initialize(Creature* owner) +void ChaseMovementGenerator<Creature>::DoInitialize(Creature* owner) { owner->SetWalk(false); owner->AddUnitState(UNIT_STATE_CHASE | UNIT_STATE_CHASE_MOVE); @@ -203,15 +203,15 @@ void ChaseMovementGenerator<Creature>::Initialize(Creature* owner) } template<class T> -void ChaseMovementGenerator<T>::Finalize(T* owner) +void ChaseMovementGenerator<T>::DoFinalize(T* owner) { owner->ClearUnitState(UNIT_STATE_CHASE | UNIT_STATE_CHASE_MOVE); } template<class T> -void ChaseMovementGenerator<T>::Reset(T* owner) +void ChaseMovementGenerator<T>::DoReset(T* owner) { - Initialize(owner); + DoInitialize(owner); } template<class T> @@ -259,7 +259,7 @@ void FollowMovementGenerator<Creature>::_updateSpeed(Creature* u) } template<> -void FollowMovementGenerator<Player>::Initialize(Player* owner) +void FollowMovementGenerator<Player>::DoInitialize(Player* owner) { owner->AddUnitState(UNIT_STATE_FOLLOW | UNIT_STATE_FOLLOW_MOVE); _updateSpeed(owner); @@ -267,7 +267,7 @@ void FollowMovementGenerator<Player>::Initialize(Player* owner) } template<> -void FollowMovementGenerator<Creature>::Initialize(Creature* owner) +void FollowMovementGenerator<Creature>::DoInitialize(Creature* owner) { owner->AddUnitState(UNIT_STATE_FOLLOW | UNIT_STATE_FOLLOW_MOVE); _updateSpeed(owner); @@ -275,14 +275,14 @@ void FollowMovementGenerator<Creature>::Initialize(Creature* owner) } template<class T> -void FollowMovementGenerator<T>::Finalize(T* owner) +void FollowMovementGenerator<T>::DoFinalize(T* owner) { owner->ClearUnitState(UNIT_STATE_FOLLOW | UNIT_STATE_FOLLOW_MOVE); _updateSpeed(owner); } template<class T> -void FollowMovementGenerator<T>::Reset(T* owner) +void FollowMovementGenerator<T>::DoReset(T* owner) { Initialize(owner); } @@ -305,21 +305,21 @@ template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Play template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player*, bool); template void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature*, bool); template void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::_setTargetLocation(Creature*, bool); -template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::Update(Player*, uint32); -template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::Update(Player*, uint32); -template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::Update(Creature*, uint32); -template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::Update(Creature*, uint32); +template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::DoUpdate(Player*, uint32); +template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::DoUpdate(Player*, uint32); +template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::DoUpdate(Creature*, uint32); +template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::DoUpdate(Creature*, uint32); template void ChaseMovementGenerator<Player>::_reachTarget(Player*); template void ChaseMovementGenerator<Creature>::_reachTarget(Creature*); -template void ChaseMovementGenerator<Player>::Finalize(Player*); -template void ChaseMovementGenerator<Creature>::Finalize(Creature*); -template void ChaseMovementGenerator<Player>::Reset(Player*); -template void ChaseMovementGenerator<Creature>::Reset(Creature*); +template void ChaseMovementGenerator<Player>::DoFinalize(Player*); +template void ChaseMovementGenerator<Creature>::DoFinalize(Creature*); +template void ChaseMovementGenerator<Player>::DoReset(Player*); +template void ChaseMovementGenerator<Creature>::DoReset(Creature*); template void ChaseMovementGenerator<Player>::MovementInform(Player*); -template void FollowMovementGenerator<Player>::Finalize(Player*); -template void FollowMovementGenerator<Creature>::Finalize(Creature*); -template void FollowMovementGenerator<Player>::Reset(Player*); -template void FollowMovementGenerator<Creature>::Reset(Creature*); +template void FollowMovementGenerator<Player>::DoFinalize(Player*); +template void FollowMovementGenerator<Creature>::DoFinalize(Creature*); +template void FollowMovementGenerator<Player>::DoReset(Player*); +template void FollowMovementGenerator<Creature>::DoReset(Creature*); template void FollowMovementGenerator<Player>::MovementInform(Player*); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 987baa91133..6b47821bbaa 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -47,7 +47,7 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >, ~TargetedMovementGeneratorMedium() { delete i_path; } public: - bool Update(T*, uint32); + bool DoUpdate(T*, uint32); Unit* GetTarget() const { return i_target.getTarget(); } void unitSpeedChanged() { i_recalculateTravel = true; } @@ -75,9 +75,9 @@ class ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMo MovementGeneratorType GetMovementGeneratorType() { return CHASE_MOTION_TYPE; } - void Initialize(T*); - void Finalize(T*); - void Reset(T*); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); void MovementInform(T*); static void _clearUnitStateMove(T* u) { u->ClearUnitState(UNIT_STATE_CHASE_MOVE); } @@ -99,9 +99,9 @@ class FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, Follow MovementGeneratorType GetMovementGeneratorType() { return FOLLOW_MOTION_TYPE; } - void Initialize(T*); - void Finalize(T*); - void Reset(T*); + void DoInitialize(T*); + void DoFinalize(T*); + void DoReset(T*); void MovementInform(T*); static void _clearUnitStateMove(T* u) { u->ClearUnitState(UNIT_STATE_FOLLOW_MOVE); } diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index d3b63ed6331..ffc4afebf2a 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -48,19 +48,19 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature) StartMoveNow(creature); } -void WaypointMovementGenerator<Creature>::Initialize(Creature* creature) +void WaypointMovementGenerator<Creature>::DoInitialize(Creature* creature) { LoadPath(creature); creature->AddUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE); } -void WaypointMovementGenerator<Creature>::Finalize(Creature* creature) +void WaypointMovementGenerator<Creature>::DoFinalize(Creature* creature) { creature->ClearUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE); creature->SetWalk(false); } -void WaypointMovementGenerator<Creature>::Reset(Creature* creature) +void WaypointMovementGenerator<Creature>::DoReset(Creature* creature) { creature->AddUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE); StartMoveNow(creature); @@ -130,7 +130,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature) return true; } -bool WaypointMovementGenerator<Creature>::Update(Creature* creature, uint32 diff) +bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 diff) { // Waypoint movement can be switched on/off // This is quite handy for escort quests and other stuff @@ -167,7 +167,7 @@ void WaypointMovementGenerator<Creature>::MovementInform(Creature* creature) creature->AI()->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode); } -bool WaypointMovementGenerator<Creature>::GetResetPosition(Creature*, float& x, float& y, float& z) +bool WaypointMovementGenerator<Creature>::GetResetPos(Creature*, float& x, float& y, float& z) { // prevent a crash at empty waypoint path. if (!i_path || i_path->empty()) @@ -196,13 +196,13 @@ uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const return i_path->size(); } -void FlightPathMovementGenerator::Initialize(Player* player) +void FlightPathMovementGenerator::DoInitialize(Player* player) { Reset(player); InitEndGridInfo(); } -void FlightPathMovementGenerator::Finalize(Player* player) +void FlightPathMovementGenerator::DoFinalize(Player* player) { // remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack) player->ClearUnitState(UNIT_STATE_IN_FLIGHT); @@ -222,7 +222,7 @@ void FlightPathMovementGenerator::Finalize(Player* player) #define PLAYER_FLIGHT_SPEED 32.0f -void FlightPathMovementGenerator::Reset(Player* player) +void FlightPathMovementGenerator::DoReset(Player* player) { player->getHostileRefManager().setOnlineOfflineState(false); player->AddUnitState(UNIT_STATE_IN_FLIGHT); @@ -241,7 +241,7 @@ void FlightPathMovementGenerator::Reset(Player* player) init.Launch(); } -bool FlightPathMovementGenerator::Update(Player* player, uint32 /*diff*/) +bool FlightPathMovementGenerator::DoUpdate(Player* player, uint32 /*diff*/) { uint32 pointId = (uint32)player->movespline->currentPathIdx(); if (pointId > i_currentNode) @@ -288,7 +288,7 @@ void FlightPathMovementGenerator::DoEventIfAny(Player* player, TaxiPathNodeEntry } } -bool FlightPathMovementGenerator::GetResetPosition(Player*, float& x, float& y, float& z) +bool FlightPathMovementGenerator::GetResetPos(Player*, float& x, float& y, float& z) { const TaxiPathNodeEntry& node = (*i_path)[i_currentNode]; x = node.x; y = node.y; z = node.z; diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index bf3f6f4cae3..5f468ffc3a4 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -65,10 +65,10 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) {} ~WaypointMovementGenerator() { i_path = NULL; } - void Initialize(Creature*); - void Finalize(Creature*); - void Reset(Creature*); - bool Update(Creature*, uint32 diff); + void DoInitialize(Creature*); + void DoFinalize(Creature*); + void DoReset(Creature*); + bool DoUpdate(Creature*, uint32 diff); void MovementInform(Creature*); @@ -77,7 +77,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea // now path movement implmementation void LoadPath(Creature*); - bool GetResetPosition(Creature*, float& x, float& y, float& z); + bool GetResetPos(Creature*, float& x, float& y, float& z); private: @@ -118,10 +118,10 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig i_path = &pathnodes; i_currentNode = startNode; } - void Initialize(Player*); - void Reset(Player*); - void Finalize(Player*); - bool Update(Player*, uint32); + void DoInitialize(Player*); + void DoReset(Player*); + void DoFinalize(Player*); + bool DoUpdate(Player*, uint32); MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; } TaxiPathNodeList const& GetPath() { return *i_path; } @@ -131,7 +131,7 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig void SkipCurrentNode() { ++i_currentNode; } void DoEventIfAny(Player* player, TaxiPathNodeEntry const& node, bool departure); - bool GetResetPosition(Player*, float& x, float& y, float& z); + bool GetResetPos(Player*, float& x, float& y, float& z); void InitEndGridInfo(); void PreloadEndGrid(); @@ -143,4 +143,3 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig uint32 _preloadTargetNode; //! node index where preloading starts }; #endif - diff --git a/src/server/game/Movement/Waypoints/Path.h b/src/server/game/Movement/Waypoints/Path.h index 038958593fb..f86b62c8be8 100644 --- a/src/server/game/Movement/Waypoints/Path.h +++ b/src/server/game/Movement/Waypoints/Path.h @@ -98,4 +98,3 @@ class Path typedef Path<PathNode> SimplePath; #endif - diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h index df20c513c90..3417b44ef09 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.h +++ b/src/server/game/Movement/Waypoints/WaypointManager.h @@ -68,4 +68,3 @@ class WaypointMgr #define sWaypointMgr ACE_Singleton<WaypointMgr, ACE_Null_Mutex>::instance() #endif - |