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

uniquePTR

Browse Source
This commit is contained in:
SafwatHalaby 2015-05-15 20:25:44 +03:00
parent 774609b405
commit a8878dd2b6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mobs/Path.cpp
View File

@ -215,11 +215,6 @@ bool cPath::Step_Internal()
void cPath::FinishCalculation() void cPath::FinishCalculation()
{ {
for (auto && pair : m_Map)
{
delete pair.second;
}
m_Map.clear(); m_Map.clear();
m_OpenList = std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics>{}; m_OpenList = std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics>{};
} }
@ -348,7 +343,7 @@ cPathCell * cPath::GetCell(const Vector3i & a_Location)
{ {
Cell = new cPathCell(); Cell = new cPathCell();
Cell->m_Location = a_Location; Cell->m_Location = a_Location;
m_Map[a_Location] = Cell; m_Map[a_Location] = UniquePtr<cPathCell>(Cell);
Cell->m_IsSolid = IsSolid(a_Location); Cell->m_IsSolid = IsSolid(a_Location);
Cell->m_Status = eCellStatus::NOLIST; Cell->m_Status = eCellStatus::NOLIST;
#ifdef COMPILING_PATHFIND_DEBUGGER #ifdef COMPILING_PATHFIND_DEBUGGER
@ -360,6 +355,6 @@ cPathCell * cPath::GetCell(const Vector3i & a_Location)
} }
else else
{ {
return m_Map[a_Location]; return m_Map[a_Location].get();
} }
} }

2
src/Mobs/Path.h
View File

@ -131,7 +131,7 @@ private:
/* Pathfinding fields */ /* Pathfinding fields */
std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics> m_OpenList; std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics> m_OpenList;
std::unordered_map<Vector3i, cPathCell *, VectorHasher> m_Map; std::unordered_map<Vector3i, UniquePtr<cPathCell>, VectorHasher> m_Map;
Vector3i m_Destination; Vector3i m_Destination;
Vector3i m_Source; Vector3i m_Source;
int m_StepsLeft; int m_StepsLeft;