Pathing is essentially fully functional now, still could use improvements here and there

zone/CMakeLists.txt

@@ -183,7 +183,6 @@ SET(zone_headers
 	npc_ai.h
 	object.h
 	oriented_bounding_box.h
-	pathing.h
 	perlpacket.h
 	petitions.h
 	pets.h

zone/client.h

@@ -1256,7 +1256,7 @@ public:
 	bool InterrogateInventory(Client* requester, bool log, bool silent, bool allowtrip, bool& error, bool autolog = true);
 
 	void SetNextInvSnapshot(uint32 interval_in_min) {
-		m_epp.last_invsnapshot_time = time(nullptr);
+		m_epp.last_invsnapshot_time = (uint32)time(nullptr);
 		m_epp.next_invsnapshot_time = m_epp.last_invsnapshot_time + (interval_in_min * 60);
 	}
 	uint32 GetLastInvSnapshotTime() { return m_epp.last_invsnapshot_time; }

zone/client_packet.cpp

@@ -5630,7 +5630,7 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 		}
 
 		glm::vec3 dest(target->GetX(), target->GetY(), target->GetZ());
-		auto route = zone->pathing_new.FindRoute(glm::vec3(GetX(), GetY(), GetZ()), dest);
+		auto route = zone->pathing.FindRoute(glm::vec3(GetX(), GetY(), GetZ()), dest);
 		CreatePathFromRoute(dest, route);
 	}
 }

zone/client_process.cpp

@@ -236,8 +236,8 @@ bool Client::Process() {
 			CheckMercSuspendTimer();
 		}
 
-		//if(IsAIControlled())
-			//AI_Process();
+		if(IsAIControlled())
+			AI_Process();
 
 		// Don't reset the bindwound timer so we can check it in BindWound as well.
 		if (bindwound_timer.Check(false) && bindwound_target != 0) {

zone/command.cpp

@@ -58,7 +58,6 @@
 #include "command.h"
 #include "guild_mgr.h"
 #include "map.h"
-#include "pathing.h"
 #include "qglobals.h"
 #include "queryserv.h"
 #include "quest_parser_collection.h"

zone/embparser_api.cpp

@@ -1930,52 +1930,6 @@ XS(XS__repopzone)
 	XSRETURN_EMPTY;
 }
 
-XS(XS__ConnectNodeToNode);
-XS(XS__ConnectNodeToNode)
-{
-	dXSARGS;
-	if (items != 4)
-		Perl_croak(aTHX_ "Usage: ConnectNodeToNode(node1, node2, teleport, doorid)");
-
-	int	node1 = (int)SvIV(ST(0));
-	int	node2 = (int)SvIV(ST(1));
-	int	teleport = (int)SvIV(ST(2));
-	int	doorid = (int)SvIV(ST(3));
-
-	quest_manager.ConnectNodeToNode(node1, node2, teleport, doorid);
-
-	XSRETURN_EMPTY;
-}
-
-XS(XS__AddNode);
-XS(XS__AddNode)
-{
-	dXSARGS;
-	//void QuestManager::AddNode(float x, float y, float z, float best_z, int32 requested_id);
-	if (items < 3 || items > 5)
-		Perl_croak(aTHX_ "Usage: AddNode(x, y, z, [best_z], [requested_id])");
-
-	int	x = (int)SvIV(ST(0));
-	int	y = (int)SvIV(ST(1));
-	int	z = (int)SvIV(ST(2));
-	int	best_z = 0;
-	int requested_id = 0;
-
-	if (items == 4)
-	{
-		best_z = (int)SvIV(ST(3));
-	}
-	else if (items == 5)
-	{
-		best_z = (int)SvIV(ST(3));
-		requested_id = (int)SvIV(ST(4));
-	}
-
-	quest_manager.AddNode(x, y, z, best_z, requested_id);
-
-	XSRETURN_EMPTY;
-}
-
 XS(XS__npcrace);
 XS(XS__npcrace)
 {
@@ -3818,8 +3772,6 @@ EXTERN_C XS(boot_quest)
 		newXS(strcpy(buf, "reloadzonestaticdata"), XS__reloadzonestaticdata, file);
 		newXS(strcpy(buf, "removetitle"), XS__removetitle, file);
 		newXS(strcpy(buf, "repopzone"), XS__repopzone, file);
-		newXS(strcpy(buf, "ConnectNodeToNode"), XS__ConnectNodeToNode, file);
-		newXS(strcpy(buf, "AddNode"), XS__AddNode, file);
 		newXS(strcpy(buf, "resettaskactivity"), XS__resettaskactivity, file);
 		newXS(strcpy(buf, "respawn"), XS__respawn, file);
 		newXS(strcpy(buf, "resume"), XS__resume, file);

zone/entity.cpp

@@ -2691,26 +2691,6 @@ void EntityList::ListPlayerCorpses(Client *client)
 	client->Message(0, "%d player corpses listed.", x);
 }
 
-void EntityList::FindPathsToAllNPCs()
-{
-	if (!zone->pathing)
-		return;
-
-	auto it = npc_list.begin();
-	while (it != npc_list.end()) {
-		glm::vec3 Node0 = zone->pathing->GetPathNodeCoordinates(0, false);
-		glm::vec3 Dest(it->second->GetX(), it->second->GetY(), it->second->GetZ());
-		std::deque<int> Route = zone->pathing->FindRoute(Node0, Dest);
-		if (Route.size() == 0)
-			printf("Unable to find a route to %s\n", it->second->GetName());
-		else
-			printf("Found a route to %s\n", it->second->GetName());
-		++it;
-	}
-
-	fflush(stdout);
-}
-
 // returns the number of corpses deleted. A negative number indicates an error code.
 int32 EntityList::DeleteNPCCorpses()
 {

zone/entity.h

@@ -350,7 +350,6 @@ public:
 	void	ListNPCs(Client* client, const char* arg1 = 0, const char* arg2 = 0, uint8 searchtype = 0);
 	void	ListNPCCorpses(Client* client);
 	void	ListPlayerCorpses(Client* client);
-	void	FindPathsToAllNPCs();
 	int32	DeleteNPCCorpses();
 	int32	DeletePlayerCorpses();
 	void	WriteEntityIDs();

zone/fearpath.cpp

@@ -19,7 +19,6 @@
 #include "../common/rulesys.h"
 
 #include "map.h"
-#include "pathing.h"
 #include "zone.h"
 
 #ifdef _WINDOWS
@@ -46,7 +45,7 @@ void Mob::CheckFlee() {
 
 	//see if were possibly hurt enough
 	float ratio = GetHPRatio();
-	float fleeratio = GetSpecialAbility(FLEE_PERCENT);
+	float fleeratio = (float)GetSpecialAbility(FLEE_PERCENT);
 	fleeratio = fleeratio > 0 ? fleeratio : RuleI(Combat, FleeHPRatio);
 
 	if(ratio >= fleeratio)
@@ -106,7 +105,7 @@ void Mob::ProcessFlee()
 	}
 
 	//see if we are still dying, if so, do nothing
-	float fleeratio = GetSpecialAbility(FLEE_PERCENT);
+	float fleeratio = (float)GetSpecialAbility(FLEE_PERCENT);
 	fleeratio = fleeratio > 0 ? fleeratio : RuleI(Combat, FleeHPRatio);
 	if (GetHPRatio() < fleeratio)
 		return;
@@ -125,28 +124,11 @@ void Mob::ProcessFlee()
 
 void Mob::CalculateNewFearpoint()
 {
-	if(RuleB(Pathing, Fear) && zone->pathing)
-	{
-		int Node = zone->pathing->GetRandomPathNode();
-
-		glm::vec3 Loc = zone->pathing->GetPathNodeCoordinates(Node);
-
-		++Loc.z;
-
-		glm::vec3 CurrentPosition(GetX(), GetY(), GetZ());
-
-		std::deque<int> Route = zone->pathing->FindRoute(CurrentPosition, Loc);
-
-		if(Route.size() > 0)
-		{
-            m_FearWalkTarget = glm::vec3(Loc.x, Loc.y, Loc.z);
-			currently_fleeing = true;
-
-			Log.Out(Logs::Detail, Logs::None, "Feared to node %i (%8.3f, %8.3f, %8.3f)", Node, Loc.x, Loc.y, Loc.z);
-			return;
-		}
-
-		Log.Out(Logs::Detail, Logs::None, "No path found to selected node. Falling through to old fear point selection.");
+	glm::vec3 pos;
+	if (zone->pathing.GetRandomPoint(glm::vec3(GetX(), GetY(), GetZ()), 500.0f, pos)) {
+		currently_fleeing = true;
+		m_FearWalkTarget = pos;
+		return;
 	}
 
 	int loop = 0;
@@ -168,6 +150,7 @@ void Mob::CalculateNewFearpoint()
 			break;
 		}
 	}
+	
 	if (currently_fleeing)
         m_FearWalkTarget = glm::vec3(ranx, rany, ranz);
 	else //Break fear

zone/lua_client.cpp

@@ -1049,12 +1049,12 @@ void Lua_Client::IncrementAA(int aa) {
 
 bool Lua_Client::GrantAlternateAdvancementAbility(int aa_id, int points) {
 	Lua_Safe_Call_Bool();
-	self->GrantAlternateAdvancementAbility(aa_id, points);
+	return self->GrantAlternateAdvancementAbility(aa_id, points);
 }
 
 bool Lua_Client::GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost) {
 	Lua_Safe_Call_Bool();
-	self->GrantAlternateAdvancementAbility(aa_id, points, ignore_cost);
+	return self->GrantAlternateAdvancementAbility(aa_id, points, ignore_cost);
 }
 
 void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z) {

zone/map.cpp

@@ -873,7 +873,7 @@ bool Map::LoadV2(FILE *f) {
 		}
 	}
 
-	uint32 face_count = indices.size() / 3;
+	uint32 face_count = (uint32)indices.size() / 3;
 
 	if (imp) {
 		imp->rm->release();

zone/merc.cpp

@@ -1304,7 +1304,7 @@ bool Merc::Process()
 		return true;
 
 	// Merc AI
-	//AI_Process();
+	AI_Process();
 
 	return true;
 }

zone/mob.cpp

@@ -415,15 +415,8 @@ Mob::Mob(const char* in_name,
     m_TargetRing = glm::vec3();
 
 	flymode = FlyMode3;
-	// Pathing
-	PathingLOSState = UnknownLOS;
-	PathingLoopCount = 0;
-	PathingLastNodeVisited = -1;
-	PathingLOSCheckTimer = new Timer(RuleI(Pathing, LOSCheckFrequency));
-	PathingRouteUpdateTimerShort = new Timer(RuleI(Pathing, RouteUpdateFrequencyShort));
-	PathingRouteUpdateTimerLong = new Timer(RuleI(Pathing, RouteUpdateFrequencyLong));
+
 	DistractedFromGrid = false;
-	PathingTraversedNodes = 0;
 	hate_list.SetHateOwner(this);
 
 	m_AllowBeneficial = false;
@@ -469,9 +462,6 @@ Mob::~Mob()
 		entity_list.DestroyTempPets(this);
 	}
 	entity_list.UnMarkNPC(GetID());
-	safe_delete(PathingLOSCheckTimer);
-	safe_delete(PathingRouteUpdateTimerShort);
-	safe_delete(PathingRouteUpdateTimerLong);
 	UninitializeBuffSlots();
 }
 
@@ -1564,8 +1554,7 @@ void Mob::ShowBuffList(Client* client) {
 }
 
 void Mob::GMMove(float x, float y, float z, float heading, bool SendUpdate) {
-
-	Route.clear();
+	m_pathing_route = PathfindingRoute();
 
 	if(IsNPC()) {
 		entity_list.ProcessMove(CastToNPC(), x, y, z);

zone/mob.h

@@ -18,10 +18,10 @@
 #ifndef MOB_H
 #define MOB_H
 
+#include "../common/pathfind.h"
 #include "common.h"
 #include "entity.h"
 #include "hate_list.h"
-#include "pathing.h"
 #include "position.h"
 #include "aa_ability.h"
 #include "aa.h"
@@ -473,7 +473,7 @@ public:
 	int GetBaseRunspeed() const { return base_runspeed; }
 	int GetBaseWalkspeed() const { return base_walkspeed; }
 	int GetBaseFearSpeed() const { return base_fearspeed; }
-	float GetMovespeed() const { return IsRunning() ? GetRunspeed() : GetWalkspeed(); }
+	float GetMovespeed() const { return IsRunning() ? (float)GetRunspeed() : (float)GetWalkspeed(); }
 	bool IsRunning() const { return m_is_running; }
 	void SetRunning(bool val) { m_is_running = val; }
 	virtual void GMMove(float x, float y, float z, float heading = 0.01, bool SendUpdate = true);
@@ -1141,8 +1141,8 @@ protected:
 	virtual int16 GetFocusEffect(focusType type, uint16 spell_id) { return 0; }
 	void CalculateNewFearpoint();
 	float FindGroundZ(float new_x, float new_y, float z_offset=0.0);
-	glm::vec3 UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &WaypointChange, bool &NodeReached);
-	void PrintRoute();
+	glm::vec3 UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &WaypointChange);
+	void TrySnapToMap();
 
 	virtual float GetSympatheticProcChances(uint16 spell_id, int16 ProcRateMod, int32 ItemProcRate = 0);
 	int16 GetSympatheticSpellProcRate(uint16 spell_id);
@@ -1313,19 +1313,8 @@ protected:
 	glm::vec3 m_FearWalkTarget;
 	bool currently_fleeing;
 
-	// Pathing
-	//
-	glm::vec3 PathingDestination;
-	glm::vec3 PathingLastPosition;
-	int PathingLoopCount;
-	int PathingLastNodeVisited;
-	std::deque<int> Route;
-	LOSType PathingLOSState;
-	Timer *PathingLOSCheckTimer;
-	Timer *PathingRouteUpdateTimerShort;
-	Timer *PathingRouteUpdateTimerLong;
+	PathfindingRoute m_pathing_route;
 	bool DistractedFromGrid;
-	int PathingTraversedNodes;
 
 	uint32 pDontHealMeBefore;
 	uint32 pDontBuffMeBefore;

zone/mob_ai.cpp

@@ -586,10 +586,6 @@ void Client::AI_Stop() {
 
 // only call this on a zone shutdown event
 void Mob::AI_ShutDown() {
-	safe_delete(PathingLOSCheckTimer);
-	safe_delete(PathingRouteUpdateTimerShort);
-	safe_delete(PathingRouteUpdateTimerLong);
-
 	attack_timer.Disable();
 	attack_dw_timer.Disable();
 	ranged_timer.Disable();
@@ -787,20 +783,12 @@ void Client::AI_Process()
 						// Calculate a new point to run to
 						CalculateNewFearpoint();
 					}
-					if(!RuleB(Pathing, Fear) || !zone->pathing)
-						CalculateNewPosition2(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z, speed, true);
-					else
-					{
-						bool WaypointChanged, NodeReached;
 
-						glm::vec3 Goal = UpdatePath(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z,
-									speed, WaypointChanged, NodeReached);
+					bool WaypointChanged;
+					glm::vec3 Goal = UpdatePath(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z,
+								speed, WaypointChanged);
 
-						if(WaypointChanged)
-							tar_ndx = 20;
-
-						CalculateNewPosition2(Goal.x, Goal.y, Goal.z, speed);
-					}
+					CalculateNewPosition2(Goal.x, Goal.y, Goal.z, speed);
 				}
 				return;
 			}
@@ -869,19 +857,12 @@ void Client::AI_Process()
 					animation = newspeed;
 					newspeed *= 2;
 					SetCurrentSpeed(newspeed);
-					if(!RuleB(Pathing, Aggro) || !zone->pathing)
-						CalculateNewPosition2(GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ(), newspeed);
-					else
-					{
-						bool WaypointChanged, NodeReached;
-						glm::vec3 Goal = UpdatePath(GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ(),
-							GetRunspeed(), WaypointChanged, NodeReached);
+					
+					bool WaypointChanged;
+					glm::vec3 Goal = UpdatePath(GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ(),
+						GetRunspeed(), WaypointChanged);
 
-						if(WaypointChanged)
-							tar_ndx = 20;
-
-						CalculateNewPosition2(Goal.x, Goal.y, Goal.z, newspeed);
-					}
+					CalculateNewPosition2(Goal.x, Goal.y, Goal.z, newspeed);
 				}
 			}
 			else if(IsMoving())
@@ -980,22 +961,13 @@ void Mob::AI_Process() {
 						// Calculate a new point to run to
 						CalculateNewFearpoint();
 					}
-					if(!RuleB(Pathing, Fear) || !zone->pathing)
-					{
-						CalculateNewPosition2(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z, GetFearSpeed(), true);
-					}
-					else
-					{
-						bool WaypointChanged, NodeReached;
+					
+					bool WaypointChanged;
 
-						glm::vec3 Goal = UpdatePath(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z,
-									GetFearSpeed(), WaypointChanged, NodeReached);
+					glm::vec3 Goal = UpdatePath(m_FearWalkTarget.x, m_FearWalkTarget.y, m_FearWalkTarget.z,
+								GetFearSpeed(), WaypointChanged);
 
-						if(WaypointChanged)
-							tar_ndx = 20;
-
-						CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetFearSpeed());
-					}
+					CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetFearSpeed());
 				}
 				return;
 			}
@@ -1299,20 +1271,13 @@ void Mob::AI_Process() {
 				{
 					if(!IsRooted()) {
 						Log.Out(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", target->GetName());
-						if(!RuleB(Pathing, Aggro) || !zone->pathing)
-							CalculateNewPosition2(target->GetX(), target->GetY(), target->GetZ(), GetRunspeed());
-						else
-						{
-							bool WaypointChanged, NodeReached;
 
-							glm::vec3 Goal = UpdatePath(target->GetX(), target->GetY(), target->GetZ(),
-											GetRunspeed(), WaypointChanged, NodeReached);
+						bool WaypointChanged;
 
-							if(WaypointChanged)
-								tar_ndx = 20;
+						glm::vec3 Goal = UpdatePath(target->GetX(), target->GetY(), target->GetZ(),
+										GetRunspeed(), WaypointChanged);
 
-							CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetRunspeed());
-						}
+						CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetRunspeed());
 
 					}
 					else if(IsMoving()) {
@@ -1588,18 +1553,15 @@ void NPC::AI_DoMovement() {
 				}
 				if (doMove)
 				{	// not at waypoint yet or at 0 pause WP, so keep moving
-					if(!RuleB(Pathing, AggroReturnToGrid) || !zone->pathing || (DistractedFromGrid == 0))
+					if(DistractedFromGrid == 0)
 						CalculateNewPosition2(m_CurrentWayPoint.x, m_CurrentWayPoint.y, m_CurrentWayPoint.z, walksp, true);
 					else
 					{
 						bool WaypointChanged;
-						bool NodeReached;
-						glm::vec3 Goal = UpdatePath(m_CurrentWayPoint.x, m_CurrentWayPoint.y, m_CurrentWayPoint.z, walksp, WaypointChanged, NodeReached);
-						if(WaypointChanged)
-							tar_ndx = 20;
-
-						if(NodeReached)
+						glm::vec3 Goal = UpdatePath(m_CurrentWayPoint.x, m_CurrentWayPoint.y, m_CurrentWayPoint.z, walksp, WaypointChanged);
+						if (WaypointChanged) {
 							entity_list.OpenDoorsNear(CastToNPC());
+						}
 
 						CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp, true);
 					}
@@ -1625,26 +1587,19 @@ void NPC::AI_DoMovement() {
 	else if (IsGuarding())
 	{
 		bool CP2Moved;
-		if(!RuleB(Pathing, Guard) || !zone->pathing)
-			CP2Moved = CalculateNewPosition2(m_GuardPoint.x, m_GuardPoint.y, m_GuardPoint.z, walksp);
-		else
+		if(!((m_Position.x == m_GuardPoint.x) && (m_Position.y == m_GuardPoint.y) && (m_Position.z == m_GuardPoint.z)))
 		{
-			if(!((m_Position.x == m_GuardPoint.x) && (m_Position.y == m_GuardPoint.y) && (m_Position.z == m_GuardPoint.z)))
-			{
-				bool WaypointChanged, NodeReached;
-				glm::vec3 Goal = UpdatePath(m_GuardPoint.x, m_GuardPoint.y, m_GuardPoint.z, walksp, WaypointChanged, NodeReached);
-				if(WaypointChanged)
-					tar_ndx = 20;
-
-				if(NodeReached)
-					entity_list.OpenDoorsNear(CastToNPC());
-
-				CP2Moved = CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp);
+			bool WaypointChanged;
+			glm::vec3 Goal = UpdatePath(m_GuardPoint.x, m_GuardPoint.y, m_GuardPoint.z, walksp, WaypointChanged);
+			if (WaypointChanged) {
+				entity_list.OpenDoorsNear(CastToNPC());
 			}
-			else
-				CP2Moved = false;
 
+			CP2Moved = CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp);
 		}
+		else
+			CP2Moved = false;
+
 		if (!CP2Moved)
 		{
 			if(moved) {

zone/npc.cpp

@@ -734,7 +734,7 @@ bool NPC::Process()
 		}
 	}
 
-	//AI_Process();
+	AI_Process();
 
 	return true;
 }

zone/pathing.h

@@ -74,10 +74,8 @@ public:
 	void OpenDoors(int Node1, int Node2, Mob* ForWho);
 
 	PathNode* FindPathNodeByCoordinates(float x, float y, float z);
-	void ShowPathNodeNeighbours(Client *c);
 	int GetRandomPathNode();
 
-	void NodeInfo(Client *c);
 	int32 AddNode(float x, float y, float z, float best_z, int32 requested_id = 0); //return -1 on failure, else returns the id of this node
 	bool DeleteNode(Client *c);
 	bool DeleteNode(int32 id); //returns true on success, false on failure, tries to delete a node from this map

zone/questmgr.cpp

@@ -670,79 +670,6 @@ void QuestManager::repopzone() {
 	}
 }
 
-void QuestManager::ConnectNodeToNode(int node1, int node2, int teleport, int doorid) {
-	if (!node1 || !node2)
-	{
-		Log.Out(Logs::General, Logs::Quests, "QuestManager::ConnectNodeToNode called without node1 or node2. Probably syntax error in quest file.");
-	}
-	else
-	{
-		if (!teleport)
-		{
-			teleport = 0;
-		}
-		else if (teleport == 1 || teleport == -1)
-		{
-			teleport = -1;
-		}
-
-		if (!doorid)
-		{
-			doorid = 0;
-		}
-
-		if (!zone->pathing)
-		{
-			// if no pathing bits available, make them available.
-			zone->pathing = new PathManager();
-		}
-
-		if (zone->pathing)
-		{
-			zone->pathing->ConnectNodeToNode(node1, node2, teleport, doorid);
-			Log.Out(Logs::Moderate, Logs::Quests, "QuestManager::ConnectNodeToNode connecting node %i to node %i.", node1, node2);
-		}
-	}
-}
-
-void QuestManager::AddNode(float x, float y, float z, float best_z, int32 requested_id)
-{
-	if (!x || !y || !z)
-	{
-		Log.Out(Logs::General, Logs::Quests, "QuestManager::AddNode called without x, y, z. Probably syntax error in quest file.");
-	}
-
-	if (!best_z || best_z == 0)
-	{
-		if (zone->zonemap)
-		{
-			glm::vec3 loc(x, y, z);
-			best_z = zone->zonemap->FindBestZ(loc, nullptr);
-		}
-		else
-		{
-			best_z = z;
-		}
-	}
-
-	if (!requested_id)
-	{
-		requested_id = 0;
-	}
-
-	if (!zone->pathing)
-	{
-		// if no pathing bits available, make them available.
-		zone->pathing = new PathManager();
-	}
-
-	if (zone->pathing)
-	{
-		zone->pathing->AddNode(x, y, z, best_z, requested_id);
-		Log.Out(Logs::Moderate, Logs::Quests, "QuestManager::AddNode adding node at (%i, %i, %i).", x, y, z);
-	}
-}
-
 void QuestManager::settarget(const char *type, int target_id) {
 	QuestManagerCurrentQuestVars();
 	if (!owner || !owner->IsNPC())

zone/questmgr.h

@@ -87,8 +87,6 @@ public:
 	void depopall(int npc_type = 0);
 	void depopzone(bool StartSpawnTimer = true);
 	void repopzone();
-	void ConnectNodeToNode(int node1, int node2, int teleport, int doorid);
-	void AddNode(float x, float y, float z, float best_z, int32 requested_id);
 	void settarget(const char *type, int target_id);
 	void follow(int entity_id, int distance);
 	void sfollow();

zone/zone.cpp

@@ -42,7 +42,6 @@
 #include "net.h"
 #include "npc.h"
 #include "object.h"
-#include "pathing.h"
 #include "petitions.h"
 #include "quest_parser_collection.h"
 #include "spawn2.h"
@@ -102,8 +101,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 	}
 	zone->zonemap = Map::LoadMapFile(zone->map_name);
 	zone->watermap = WaterMap::LoadWaterMapfile(zone->map_name);
-	zone->pathing = PathManager::LoadPathFile(zone->map_name);
-	zone->pathing_new.Load(zone->map_name);
+	zone->pathing.Load(zone->map_name);
 
 	char tmp[10];
 	if (database.GetVariable("loglevel",tmp, 9)) {
@@ -756,7 +754,6 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	pers_instance = false;
 	zonemap = nullptr;
 	watermap = nullptr;
-	pathing = nullptr;
 	qGlobals = nullptr;
 	default_ruleset = 0;
 
@@ -845,7 +842,6 @@ Zone::~Zone() {
 	spawn2_list.Clear();
 	safe_delete(zonemap);
 	safe_delete(watermap);
-	safe_delete(pathing);
 	if (worldserver.Connected()) {
 		worldserver.SetZoneData(0);
 	}

zone/zone.h

@@ -25,6 +25,7 @@
 #include "../common/random.h"
 #include "../common/string_util.h"
 #include "../common/pathfind.h"
+#include "map.h"
 #include "qglobals.h"
 #include "spawn2.h"
 #include "spawngroup.h"
@@ -212,8 +213,7 @@ public:
 
 	Map*	zonemap;
 	WaterMap* watermap;
-	PathManager *pathing;
-	PathfindingManager pathing_new;
+	PathfindingManager pathing;
 	NewZone_Struct	newzone_data;
 
 	SpawnConditionManager spawn_conditions;