mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style cleanup from the Mangos Futures Team

Browse source
This commit is contained in:
Antz 2020-09-14 18:30:19 +01:00
parent 809eee0f50
commit 283c68b6a9
No known key found for this signature in database
GPG key ID: 0DF907270598C85F
203 changed files with 12039 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/game/MotionGenerators/WaypointMovementGenerator.cpp
View file

@ -43,10 +43,14 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature& creature, int32 pat
DETAIL_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "LoadPath: loading waypoint path for %s", creature.GetGuidStr().c_str());
if (!overwriteEntry)
{
overwriteEntry = creature.GetEntry();
}
if (wpOrigin == PATH_NO_PATH && pathId == 0)
{
i_path = sWaypointMgr.GetDefaultPath(overwriteEntry, creature.GetGUIDLow(), &m_PathOrigin);
}
else
{
m_PathOrigin = wpOrigin == PATH_NO_PATH ? PATH_FROM_ENTRY : wpOrigin;
@ -58,9 +62,13 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature& creature, int32 pat
if (!i_path)
{
if (m_PathOrigin == PATH_FROM_EXTERNAL)
{
sLog.outErrorScriptLib("WaypointMovementGenerator::LoadPath: %s doesn't have waypoint path %i", creature.GetGuidStr().c_str(), pathId);
}
else
{
sLog.outErrorDb("WaypointMovementGenerator::LoadPath: %s doesn't have waypoint path %i", creature.GetGuidStr().c_str(), pathId);
}
return;
}
@ -186,7 +194,9 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature& creature)
{
uint32 type = WAYPOINT_MOTION_TYPE;
if (m_PathOrigin == PATH_FROM_EXTERNAL && m_pathId > 0)
{
type = EXTERNAL_WAYPOINT_MOVE + m_pathId;
}
creature.AI()->MovementInform(type, i_currentNode);
}
@ -237,9 +247,13 @@ void WaypointMovementGenerator<Creature>::StartMove(Creature& creature)
if (creature.AI() && m_PathOrigin == PATH_FROM_EXTERNAL && m_pathId > 0)
{
if (!reachedLast)
{
creature.AI()->MovementInform(EXTERNAL_WAYPOINT_MOVE_START + m_pathId, currPoint->first);
}
else
{
creature.AI()->MovementInform(EXTERNAL_WAYPOINT_FINISHED_LAST + m_pathId, currPoint->first);
}
if (creature.IsDead() || !creature.IsInWorld()) // Might have happened with above calls
{
@ -345,7 +359,9 @@ bool WaypointMovementGenerator<Creature>::GetResetPosition(Creature&, float& x,
z = curWP->z;
if (curWP->orientation != 100)
{
o = curWP->orientation;
}
else // Calculate the resulting angle based on positions between previous and current waypoint
{
WaypointNode const* prevWP;
@ -355,7 +371,9 @@ bool WaypointMovementGenerator<Creature>::GetResetPosition(Creature&, float& x,
prevWP = &(lastPoint->second);
}
else // Take the last waypoint (crbegin()) as previous
{
prevWP = &(i_path->rbegin()->second);
}
float dx = x - prevWP->x;
float dy = y - prevWP->y;