summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSafwatHalaby <SafwatHalaby@users.noreply.github.com>2015-05-19 20:07:05 +0200
committerSafwatHalaby <SafwatHalaby@users.noreply.github.com>2015-05-19 20:07:05 +0200
commit0741ad3526096ce0494a984c612b3dfca18fe6bb (patch)
treeeaa1a2daadd333c0b5f694d0437236d3510ff6c9
parentMerge pull request #2049 from mc-server/sapling-probability (diff)
downloadcuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar.gz
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar.bz2
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar.lz
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar.xz
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.tar.zst
cuberite-0741ad3526096ce0494a984c612b3dfca18fe6bb.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Path.cpp24
-rw-r--r--src/Mobs/Path.h12
2 files changed, 17 insertions, 19 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];
}
}
diff --git a/src/Mobs/Path.h b/src/Mobs/Path.h
index 7a4182f17..b3ad5ffd5 100644
--- a/src/Mobs/Path.h
+++ b/src/Mobs/Path.h
@@ -24,7 +24,15 @@ class cChunk;
/* Various little structs and classes */
enum class ePathFinderStatus {CALCULATING, PATH_FOUND, PATH_NOT_FOUND, NEARBY_FOUND};
-struct cPathCell; // Defined inside Path.cpp
+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.
+};
class compareHeuristics
{
public:
@@ -144,7 +152,7 @@ private:
/* Pathfinding fields */
std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics> m_OpenList;
- std::unordered_map<Vector3i, UniquePtr<cPathCell>, VectorHasher> m_Map;
+ std::unordered_map<Vector3i, cPathCell, VectorHasher> m_Map;
Vector3i m_Destination;
Vector3i m_Source;
int m_StepsLeft;