Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: WaypointMovementGenerator cleanup

Browse Source
This commit is contained in:
Treeston
2018-02-12 02:57:55 +01:00
parent d02f481d9a
commit fe1ba18905
2 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View File

@@ -38,8 +38,10 @@ WaypointMovementGenerator<Creature>::WaypointMovementGenerator(WaypointPath& pat
_path = &path;
}
void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature)
void WaypointMovementGenerator<Creature>::DoInitialize(Creature* creature)
{
_done = false;
if (_loadedFromDB)
{
if (!_pathId)
@@ -51,7 +53,7 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature)
if (!_path)
{
// No path id found for entry
TC_LOG_ERROR("sql.sql", "WaypointMovementGenerator::LoadPath: creature %s (Entry: %u GUID: %u DB GUID: %u) doesn't have waypoint path id: %u", creature->GetName().c_str(), creature->GetEntry(), creature->GetGUID().GetCounter(), creature->GetSpawnId(), _pathId);
TC_LOG_ERROR("sql.sql", "WaypointMovementGenerator::DoInitialize: creature %s (Entry: %u GUID: %u DB GUID: %u) doesn't have waypoint path id: %u", creature->GetName().c_str(), creature->GetEntry(), creature->GetGUID().GetCounter(), creature->GetSpawnId(), _pathId);
return;
}
@@ -62,12 +64,6 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature)
creature->AI()->WaypointPathStarted(_path->id);
}
void WaypointMovementGenerator<Creature>::DoInitialize(Creature* creature)
{
_done = false;
LoadPath(creature);
}
void WaypointMovementGenerator<Creature>::DoFinalize(Creature* creature)
{
creature->ClearUnitState(UNIT_STATE_ROAMING | UNIT_STATE_ROAMING_MOVE);
@@ -76,8 +72,8 @@ void WaypointMovementGenerator<Creature>::DoFinalize(Creature* creature)
void WaypointMovementGenerator<Creature>::DoReset(Creature* creature)
{
if (!_done && CanMove(creature))
StartMoveNow(creature);
if (!_done && _nextMoveTime.Passed() && CanMove(creature))
StartMove(creature);
else if (_done)
{
// mimic IdleMovementGenerator
@@ -116,19 +112,19 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* creature)
creature->UpdateCurrentWaypointInfo(waypoint.id, _path->id);
}
bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
void WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
{
if (!creature || !creature->IsAlive())
return true;
return;
if (_done || !_path || _path->nodes.empty())
return true;
return;
// if the owner is the leader of its formation, check members status
if (creature->IsFormationLeader() && !creature->IsFormationLeaderMoveAllowed())
if (!CanMove(creature) || (creature->IsFormationLeader() && !creature->IsFormationLeaderMoveAllowed()))
{
_nextMoveTime.Reset(1000);
return true;
return;
}
bool transportPath = creature->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && !creature->GetTransGUID().IsEmpty();
@@ -166,7 +162,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
// inform AI
if (creature->IsAIEnabled)
creature->AI()->WaypointPathEnded(waypoint.id, _path->id);
return true;
return;
}
_currentNode = (_currentNode + 1) % _path->nodes.size();
@@ -177,7 +173,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
}
ASSERT(_currentNode < _path->nodes.size(), "WaypointMovementGenerator::StartMove: tried to reference a node id (%u) which is not included in path (%u)", _currentNode, _path->id);
WaypointNode const &waypoint = _path->nodes.at(_currentNode);
WaypointNode const &waypoint = _path->nodes[_currentNode];
Position formationDest(waypoint.x, waypoint.y, waypoint.z, (waypoint.orientation && waypoint.delay) ? waypoint.orientation : 0.0f);
_isArrivalDone = false;
@@ -230,7 +226,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
// inform formation
creature->SignalFormationMovement(formationDest, waypoint.id, waypoint.moveType, (waypoint.orientation && waypoint.delay) ? true : false);
return true;
return;
}
bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 diff)
@@ -239,46 +235,31 @@ bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 di
return true;
if (_done || !_path || _path->nodes.empty())
return true;
return false;
if (_stalled || creature->HasUnitState(UNIT_STATE_NOT_MOVE) || creature->IsMovementPreventedByCasting())
{
creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
creature->StopMoving();
return true;
}
if (!_nextMoveTime.Passed())
{
if (creature->movespline->Finalized())
{
_nextMoveTime.Update(diff);
if (_nextMoveTime.Passed())
return StartMoveNow(creature);
}
}
else
{
if (creature->movespline->Finalized())
{
OnArrived(creature);
_isArrivalDone = true;
_nextMoveTime.Update(diff);
if (_nextMoveTime.Passed())
return StartMove(creature);
}
else
{
// Set home position at place on waypoint movement.
if (!creature->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) || creature->GetTransGUID().IsEmpty())
creature->SetHomePosition(creature->GetPosition());
if (_recalculateSpeed)
{
if (_nextMoveTime.Passed())
StartMove(creature);
}
}
if (creature->HasUnitState(UNIT_STATE_ROAMING_MOVE) && creature->movespline->Finalized() && !_isArrivalDone)
{
OnArrived(creature);
_isArrivalDone = true;
}
// Set home position at place on waypoint movement.
if (!creature->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) || creature->GetTransGUID().IsEmpty())
creature->SetHomePosition(creature->GetPosition());
if (_recalculateSpeed || (_nextMoveTime.Passed() && (!creature->HasUnitState(UNIT_STATE_ROAMING_MOVE) || creature->movespline->Finalized())))
StartMove(creature);
return true;
}
@@ -316,7 +297,7 @@ void WaypointMovementGenerator<Creature>::Resume(uint32 overrideTimer/* = 0*/)
_nextMoveTime.Reset(overrideTimer);
}
bool WaypointMovementGenerator<Creature>::CanMove(Creature* creature)
/*static*/ bool WaypointMovementGenerator<Creature>::CanMove(Creature* creature)
{
return _nextMoveTime.Passed() && !creature->HasUnitState(UNIT_STATE_NOT_MOVE) && !creature->IsMovementPreventedByCasting();
return !creature->HasUnitState(UNIT_STATE_NOT_MOVE) && !creature->IsMovementPreventedByCasting();
}

10
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
View File

@@ -61,15 +61,9 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium<Creat
bool GetResetPos(Creature*, float& x, float& y, float& z);
private:
void LoadPath(Creature*);
void OnArrived(Creature*);
bool StartMove(Creature*);
bool CanMove(Creature*);
bool StartMoveNow(Creature* creature)
{
_nextMoveTime.Reset(0);
return StartMove(creature);
}
void StartMove(Creature*);
static bool CanMove(Creature*);
TimeTrackerSmall _nextMoveTime;
bool _recalculateSpeed;