summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Path.cpp
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-05-20 14:06:51 +0200
committerworktycho <work.tycho@gmail.com>2015-05-20 14:06:51 +0200
commiteaedd5f19da3f6fa59f3d11d464ec567622433bd (patch)
tree20c8bc39184f3e22a663717b6b7fcd3e62235164 /src/Mobs/Path.cpp
parentMerge pull request #2076 from mc-server/Cert-disable (diff)
parentnewlines (diff)
downloadcuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar.gz
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar.bz2
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar.lz
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar.xz
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.tar.zst
cuberite-eaedd5f19da3f6fa59f3d11d464ec567622433bd.zip
Diffstat (limited to 'src/Mobs/Path.cpp')
-rw-r--r--src/Mobs/Path.cpp24
1 files changed, 7 insertions, 17 deletions
diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp
index ba8046a2b..bf5e4ba5e 100644
--- a/src/Mobs/Path.cpp
+++ b/src/Mobs/Path.cpp
@@ -11,15 +11,8 @@
#define CALCULATIONS_PER_STEP 10 // Higher means more CPU load but faster path calculations.
// The only version which guarantees the shortest path is 0, 0.
-enum class eCellStatus {OPENLIST, CLOSEDLIST, NOLIST};
-struct cPathCell
-{
- Vector3i m_Location; // Location of the cell in the world.
- int m_F, m_G, m_H; // F, G, H as defined in regular A*.
- eCellStatus m_Status; // Which list is the cell in? Either non, open, or closed.
- cPathCell * m_Parent; // Cell's parent, as defined in regular A*.
- bool m_IsSolid; // Is the cell an air or a solid? Partial solids are currently considered solids.
-};
+
+
@@ -388,23 +381,20 @@ void cPath::ProcessCell(cPathCell * a_Cell, cPathCell * a_Caller, int a_GDelta)
cPathCell * cPath::GetCell(const Vector3i & a_Location)
{
// Create the cell in the hash table if it's not already there.
- cPathCell * Cell;
if (m_Map.count(a_Location) == 0) // Case 1: Cell is not on any list. We've never checked this cell before.
{
- Cell = new cPathCell();
- Cell->m_Location = a_Location;
- m_Map[a_Location] = UniquePtr<cPathCell>(Cell);
- Cell->m_IsSolid = IsSolid(a_Location);
- Cell->m_Status = eCellStatus::NOLIST;
+ m_Map[a_Location].m_Location = a_Location;
+ m_Map[a_Location].m_IsSolid = IsSolid(a_Location);
+ m_Map[a_Location].m_Status = eCellStatus::NOLIST;
#ifdef COMPILING_PATHFIND_DEBUGGER
#ifdef COMPILING_PATHFIND_DEBUGGER_MARK_UNCHECKED
si::setBlock(a_Location.x, a_Location.y, a_Location.z, debug_unchecked, Cell->m_IsSolid ? NORMAL : MINI);
#endif
#endif
- return Cell;
+ return &m_Map[a_Location];
}
else
{
- return m_Map[a_Location].get();
+ return &m_Map[a_Location];
}
}