diff options
| author | worktycho <work.tycho@gmail.com> | 2015-05-15 19:53:16 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2015-05-15 19:53:16 +0200 |
| commit | c6658af155b607d11a29651afc2c9e9d0082bcec (patch) | |
| tree | f8d44ad24952898fe1cf6c282b9ba2128fdd3384 /src | |
| parent | Unify shields. (diff) | |
| parent | uniquePTR (diff) | |
| download | cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar.gz cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar.bz2 cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar.lz cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar.xz cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.tar.zst cuberite-c6658af155b607d11a29651afc2c9e9d0082bcec.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Mobs/Path.cpp | 9 | ||||
| -rw-r--r-- | src/Mobs/Path.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp index ba7d615ae..dd306af13 100644 --- a/src/Mobs/Path.cpp +++ b/src/Mobs/Path.cpp @@ -215,11 +215,6 @@ bool cPath::Step_Internal() void cPath::FinishCalculation() { - for (auto && pair : m_Map) - { - delete pair.second; - } - m_Map.clear(); 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->m_Location = a_Location; - m_Map[a_Location] = Cell; + m_Map[a_Location] = UniquePtr<cPathCell>(Cell); Cell->m_IsSolid = IsSolid(a_Location); Cell->m_Status = eCellStatus::NOLIST; #ifdef COMPILING_PATHFIND_DEBUGGER @@ -360,6 +355,6 @@ cPathCell * cPath::GetCell(const Vector3i & a_Location) } else { - return m_Map[a_Location]; + return m_Map[a_Location].get(); } } diff --git a/src/Mobs/Path.h b/src/Mobs/Path.h index adae77984..008722d29 100644 --- a/src/Mobs/Path.h +++ b/src/Mobs/Path.h @@ -131,7 +131,7 @@ private: /* Pathfinding fields */ 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_Source; int m_StepsLeft; |