flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Changed raw cPath to an unique_ptr, fixes memory leak

Browse Source
This commit is contained in:
Lukas Pioch 2015-12-15 01:16:36 +01:00
parent 1e5ba8a1bb
commit 1515d37684
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mobs/PathFinder.cpp
View File

@ -46,17 +46,17 @@ ePathFinderStatus cPathFinder::GetNextWayPoint(cChunk & a_Chunk, const Vector3d
} }
// If m_Path has not been initialized yet, initialize it. // If m_Path has not been initialized yet, initialize it.
if (!m_Path.IsValid()) if (!m_Path->IsValid())
{ {
ResetPathFinding(a_Chunk); ResetPathFinding(a_Chunk);
} }
switch (m_Path.CalculationStep(a_Chunk)) switch (m_Path->CalculationStep(a_Chunk))
{ {
case ePathFinderStatus::NEARBY_FOUND: case ePathFinderStatus::NEARBY_FOUND:
{ {
m_NoPathToTarget = true; m_NoPathToTarget = true;
m_PathDestination = m_Path.AcceptNearbyPath(); m_PathDestination = m_Path->AcceptNearbyPath();
if (a_DontCare) if (a_DontCare)
{ {
m_FinalDestination = m_PathDestination; m_FinalDestination = m_PathDestination;
@ -89,7 +89,7 @@ ePathFinderStatus cPathFinder::GetNextWayPoint(cChunk & a_Chunk, const Vector3d
return ePathFinderStatus::CALCULATING; return ePathFinderStatus::CALCULATING;
} }
if (m_Path.NoMoreWayPoints()) if (m_Path->NoMoreWayPoints())
{ {
// We're always heading towards m_PathDestination. // We're always heading towards m_PathDestination.
// If m_PathDestination is exactly m_FinalDestination, then we're about to reach the destination. // If m_PathDestination is exactly m_FinalDestination, then we're about to reach the destination.
@ -108,10 +108,10 @@ ePathFinderStatus cPathFinder::GetNextWayPoint(cChunk & a_Chunk, const Vector3d
} }
if (m_Path.IsFirstPoint() || ((m_WayPoint - m_Source).SqrLength() < WAYPOINT_RADIUS)) if (m_Path->IsFirstPoint() || ((m_WayPoint - m_Source).SqrLength() < WAYPOINT_RADIUS))
{ {
// if the mob has just started or if the mob reached a waypoint, give them a new waypoint. // if the mob has just started or if the mob reached a waypoint, give them a new waypoint.
m_WayPoint = m_Path.GetNextPoint(); m_WayPoint = m_Path->GetNextPoint();
m_GiveUpCounter = 40; m_GiveUpCounter = 40;
return ePathFinderStatus::PATH_FOUND; return ePathFinderStatus::PATH_FOUND;
} }
@ -142,7 +142,7 @@ void cPathFinder::ResetPathFinding(cChunk &a_Chunk)
m_NoPathToTarget = false; m_NoPathToTarget = false;
m_PathDestination = m_FinalDestination; m_PathDestination = m_FinalDestination;
m_DeviationOrigin = m_PathDestination; m_DeviationOrigin = m_PathDestination;
m_Path = cPath(a_Chunk, m_Source, m_PathDestination, 20, m_Width, m_Height); m_Path.reset(new cPath(a_Chunk, m_Source, m_PathDestination, 20, m_Width, m_Height));
} }
@ -248,7 +248,7 @@ bool cPathFinder::EnsureProperDestination(cChunk & a_Chunk)
bool cPathFinder::PathIsTooOld() const bool cPathFinder::PathIsTooOld() const
{ {
size_t acceptableDeviation = m_Path.WayPointsLeft() / 2; size_t acceptableDeviation = m_Path->WayPointsLeft() / 2;
if (acceptableDeviation == 0) if (acceptableDeviation == 0)
{ {
acceptableDeviation = 1; acceptableDeviation = 1;

2
src/Mobs/PathFinder.h
View File

@ -52,7 +52,7 @@ private:
double m_Height; double m_Height;
/** The current cPath instance we have. This is discarded and recreated when a path recalculation is needed. */ /** The current cPath instance we have. This is discarded and recreated when a path recalculation is needed. */
cPath m_Path; std::unique_ptr<cPath> m_Path;
/** If 0, will give up reaching the next m_WayPoint and will recalculate path. */ /** If 0, will give up reaching the next m_WayPoint and will recalculate path. */
int m_GiveUpCounter; int m_GiveUpCounter;