6 files changed, 118 insertions, 27 deletions

diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index 54b51454..89284a96 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -2,4 +2,5 @@
 #include "patcher.h"
 #include "AutoPilot.h"
 
+WRAPPER void CAutoPilot::RemoveOnePathNode() { EAXJMP(0x413A00); }
 WRAPPER void CAutoPilot::ModifySpeed(float) { EAXJMP(0x4137B0); }
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index 3b63a143..5a76d841 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -2,6 +2,7 @@
 #include "Timer.h"
 
 class CVehicle;
+struct CPathNode;
 
 enum eCarMission : uint8
 {
@@ -87,8 +88,8 @@ public:
 	uint8 m_bStayInFastLane : 1;
 	uint8 m_flag10 : 1;
 	CVector m_vecDestinationCoors;
-	void *m_aPathFindNodesInfo[8];
-	uint16 m_nPathFindNodesCount;
+	CPathNode *m_aPathFindNodesInfo[NUM_PATH_NODES_IN_AUTOPILOT];
+	int16 m_nPathFindNodesCount;
 	CVehicle *m_pTargetCar;
 
 	CAutoPilot(void) {
@@ -118,5 +119,6 @@ public:
 	}
 
 	void ModifySpeed(float);
+	void RemoveOnePathNode();
 };
 static_assert(sizeof(CAutoPilot) == 0x70, "CAutoPilot: error");
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 914b2f2e..e9005ef6 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -75,7 +75,6 @@ WRAPPER void CCarCtrl::RemoveFromInterestingVehicleList(CVehicle* v) { EAXJMP(0x
 WRAPPER void CCarCtrl::GenerateEmergencyServicesCar(void) { EAXJMP(0x41FC50); }
 WRAPPER void CCarCtrl::DragCarToPoint(CVehicle*, CVector*) { EAXJMP(0x41D450); }
 WRAPPER void CCarCtrl::Init(void) { EAXJMP(0x41D280); }
-WRAPPER bool CCarCtrl::PickNextNodeToFollowPath(CVehicle*) { EAXJMP(0x41CD50); }
 
 void
 CCarCtrl::GenerateRandomCars()
@@ -1648,7 +1647,7 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 	CPathNode* pTargetNode;
 	int16 numNodes;
 	float distanceToTargetNode;
-#ifdef USE_TREADABLE_PATHFIND
+#ifndef REMOVE_TREADABLE_PATHFIND
 	if (pTarget && pTarget->m_pCurGroundEntity->m_type == ENTITY_TYPE_BUILDING &&
 	  ((CBuilding*)pTarget->m_pCurGroundEntity)->GetIsATreadable() &&
 	  ((CTreadable*)pTarget->m_pCurGroundEntity)->m_nodeIndices[0][0] >= 0){
@@ -1681,7 +1680,7 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 			CVector(targetX, targetY, 0.0f),
 #endif
 			&pTargetNode, &numNodes, 1, pVehicle, &distanceToTargetNode, 999999.9f, -1);
-#ifdef USE_TREADABLE_PATHFIND
+#ifndef REMOVE_TREADABLE_PATHFIND
 	}
 #endif
 	int newNextNode;
@@ -1691,6 +1690,7 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 		nextLink = 0;
 		float lowestAngleChange = 10.0f;
 		int numLinks = pCurNode->numLinks;
+		newNextNode = 0;
 		for (int i = 0; i < numLinks; i++){
 			int conNode = ThePaths.m_connections[i + pCurNode->firstLink];
 			if (conNode == prevNode && i > 1)
@@ -1707,8 +1707,8 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 		}
 	}else{
 		nextLink = 0;
-		int idOfTargetNode = pTargetNode - ThePaths.m_pathNodes;
-		for (int i = pCurNode->firstLink; ThePaths.m_connections[i] != idOfTargetNode; i++, nextLink++)
+		newNextNode = pTargetNode - ThePaths.m_pathNodes;
+		for (int i = pCurNode->firstLink; ThePaths.m_connections[i] != newNextNode; i++, nextLink++)
 			;
 	}
 	CPathNode* pNextPathNode = &ThePaths.m_pathNodes[pVehicle->AutoPilot.m_nNextRouteNode];
@@ -1716,6 +1716,7 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 	CCarPathLink* pCurLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo];
 	pVehicle->AutoPilot.m_nPrevRouteNode = pVehicle->AutoPilot.m_nCurrentRouteNode;
 	pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nNextRouteNode;
+	pVehicle->AutoPilot.m_nNextRouteNode = newNextNode;
 	pVehicle->AutoPilot.m_nTimeEnteredCurve += pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve;
 	pVehicle->AutoPilot.m_nPreviousPathNodeInfo = pVehicle->AutoPilot.m_nCurrentPathNodeInfo;
 	pVehicle->AutoPilot.m_nCurrentPathNodeInfo = pVehicle->AutoPilot.m_nNextPathNodeInfo;
@@ -1783,6 +1784,90 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 	pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve = max(10, pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve);
 }
 
+bool CCarCtrl::PickNextNodeToFollowPath(CVehicle* pVehicle)
+{
+	int curNode = pVehicle->AutoPilot.m_nNextRouteNode;
+	CPathNode* pCurNode = &ThePaths.m_pathNodes[curNode];
+	CPathNode* pTargetNode;
+	int16 numNodes;
+	float distanceToTargetNode;
+	if (pVehicle->AutoPilot.m_nPathFindNodesCount == 0){
+		ThePaths.DoPathSearch(0, pVehicle->GetPosition(), curNode,
+			pVehicle->AutoPilot.m_vecDestinationCoors, pVehicle->AutoPilot.m_aPathFindNodesInfo,
+			&pVehicle->AutoPilot.m_nPathFindNodesCount, NUM_PATH_NODES_IN_AUTOPILOT,
+			pVehicle, nil, 999999.9f, -1);
+		if (pVehicle->AutoPilot.m_nPathFindNodesCount < 1)
+			return true;
+	}
+	CPathNode* pNextPathNode = &ThePaths.m_pathNodes[pVehicle->AutoPilot.m_nNextRouteNode];
+	CCarPathLink* pCurLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo];
+	pVehicle->AutoPilot.m_nPrevRouteNode = pVehicle->AutoPilot.m_nCurrentRouteNode;
+	pVehicle->AutoPilot.m_nCurrentRouteNode = pVehicle->AutoPilot.m_nNextRouteNode;
+	pVehicle->AutoPilot.m_nNextRouteNode = pVehicle->AutoPilot.m_aPathFindNodesInfo[0] - ThePaths.m_pathNodes;
+	pVehicle->AutoPilot.RemoveOnePathNode();
+	pVehicle->AutoPilot.m_nTimeEnteredCurve += pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve;
+	pVehicle->AutoPilot.m_nPreviousPathNodeInfo = pVehicle->AutoPilot.m_nCurrentPathNodeInfo;
+	pVehicle->AutoPilot.m_nCurrentPathNodeInfo = pVehicle->AutoPilot.m_nNextPathNodeInfo;
+	pVehicle->AutoPilot.m_nPreviousDirection = pVehicle->AutoPilot.m_nCurrentDirection;
+	pVehicle->AutoPilot.m_nCurrentDirection = pVehicle->AutoPilot.m_nNextDirection;
+	pVehicle->AutoPilot.m_nCurrentLane = pVehicle->AutoPilot.m_nNextLane;
+	int nextLink = 0;
+	for (int i = pCurNode->firstLink; ThePaths.m_connections[i] != pVehicle->AutoPilot.m_nNextRouteNode; i++, nextLink++)
+		;
+	CCarPathLink* pNextLink = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[nextLink + pCurNode->firstLink]];
+	pVehicle->AutoPilot.m_nNextPathNodeInfo = ThePaths.m_carPathConnections[nextLink + pCurNode->firstLink];
+	uint8 lanesOnNextNode;
+	if (curNode >= pVehicle->AutoPilot.m_nNextRouteNode) {
+		pVehicle->AutoPilot.m_nNextDirection = 1;
+		lanesOnNextNode = pNextLink->numLeftLanes;
+	}
+	else {
+		pVehicle->AutoPilot.m_nNextDirection = -1;
+		lanesOnNextNode = pNextLink->numRightLanes;
+	}
+	float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * pCurLink->dirX;
+	float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * pCurLink->dirY;
+	float nextPathLinkForwardX = pVehicle->AutoPilot.m_nNextDirection * pNextLink->dirX;
+	float nextPathLinkForwardY = pVehicle->AutoPilot.m_nNextDirection * pNextLink->dirY;
+	if (lanesOnNextNode >= 0) {
+		CVector2D dist = pNextPathNode->pos - pCurNode->pos;
+		if (dist.MagnitudeSqr() >= SQR(7.0f) && (CGeneral::GetRandomNumber() & 0x600) == 0) {
+			if (CGeneral::GetRandomTrueFalse())
+				pVehicle->AutoPilot.m_nNextLane += 1;
+			else
+				pVehicle->AutoPilot.m_nNextLane -= 1;
+		}
+		pVehicle->AutoPilot.m_nNextLane = min(lanesOnNextNode - 1, pVehicle->AutoPilot.m_nNextLane);
+		pVehicle->AutoPilot.m_nNextLane = max(0, pVehicle->AutoPilot.m_nNextLane);
+	}
+	else {
+		pVehicle->AutoPilot.m_nNextLane = pVehicle->AutoPilot.m_nCurrentLane;
+	}
+	if (pVehicle->AutoPilot.m_bStayInFastLane)
+		pVehicle->AutoPilot.m_nNextLane = 0;
+	CVector positionOnCurrentLinkIncludingLane(
+		pCurLink->posX + GetOffsetOfLaneFromCenterOfRoad(pVehicle->AutoPilot.m_nCurrentLane, pCurLink) * currentPathLinkForwardY,
+		pCurLink->posY - GetOffsetOfLaneFromCenterOfRoad(pVehicle->AutoPilot.m_nCurrentLane, pCurLink) * currentPathLinkForwardX,
+		0.0f);
+	CVector positionOnNextLinkIncludingLane(
+		pNextLink->posX + GetOffsetOfLaneFromCenterOfRoad(pVehicle->AutoPilot.m_nNextLane, pNextLink) * nextPathLinkForwardY,
+		pNextLink->posY - GetOffsetOfLaneFromCenterOfRoad(pVehicle->AutoPilot.m_nNextLane, pNextLink) * nextPathLinkForwardX,
+		0.0f);
+	float directionCurrentLinkX = pCurLink->dirX * pVehicle->AutoPilot.m_nCurrentDirection;
+	float directionCurrentLinkY = pCurLink->dirY * pVehicle->AutoPilot.m_nCurrentDirection;
+	float directionNextLinkX = pNextLink->dirX * pVehicle->AutoPilot.m_nNextDirection;
+	float directionNextLinkY = pNextLink->dirY * pVehicle->AutoPilot.m_nNextDirection;
+	/* We want to make a path between two links that may not have the same forward directions a curve. */
+	pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve = CCurves::CalcSpeedScaleFactor(
+		&positionOnCurrentLinkIncludingLane,
+		&positionOnNextLinkIncludingLane,
+		directionCurrentLinkX, directionCurrentLinkY,
+		directionNextLinkX, directionNextLinkY
+	) * (1000.0f / pVehicle->AutoPilot.m_fMaxTrafficSpeed);
+	pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve = max(10, pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve);
+	return false;
+}
+
 bool
 CCarCtrl::MapCouldMoveInThisArea(float x, float y)
 {
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h
index 091d2985..b06c1ca2 100644
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -15,8 +15,6 @@ enum{
 #define FIX_PATHFIND_BUG
 #endif
 
-#define USE_TREADABLE_PATHFIND
-
 class CCarCtrl
 {
 	enum eCarClass {
diff --git a/src/core/config.h b/src/core/config.h
index d119fe09..59f7f7da 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -71,7 +71,9 @@ enum Config {
 	NUMPICKUPS = 336,
 	NUMEVENTS = 64,
 
-	NUM_CARGENS = 160
+	NUM_CARGENS = 160,
+
+	NUM_PATH_NODES_IN_AUTOPILOT = 8,
 };
 
 // We'll use this once we're ready to become independent of the game
@@ -132,3 +134,4 @@ enum Config {
 #define EXPLODING_AIRTRAIN	// can blow up jumbo jet with rocket launcher
 #define ANIMATE_PED_COL_MODEL
 #define CANCELLABLE_CAR_ENTER
+//#define REMOVE_TREADABLE_PATHFIND
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 5f7b6c56..49f21c01 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -434,24 +434,26 @@ CVehicle::UsesSiren(uint32 id)
 bool
 CVehicle::IsVehicleNormal(void)
 {
-	if(pDriver && m_nNumPassengers == 0 && m_status != STATUS_WRECKED){
-		switch(GetModelIndex())
-		case MI_FIRETRUCK:
-		case MI_AMBULAN:
-		case MI_TAXI:
-		case MI_POLICE:
-		case MI_ENFORCER:
-		case MI_BUS:
-		case MI_RHINO:
-		case MI_BARRACKS:
-		case MI_DODO:
-		case MI_COACH:
-		case MI_CABBIE:
-		case MI_RCBANDIT:
-		case MI_BORGNINE:
-			return false;
+	if (!pDriver || m_nNumPassengers != 0 || m_status == STATUS_WRECKED)
+		return false;
+	switch (GetModelIndex()){
+	case MI_FIRETRUCK:
+	case MI_AMBULAN:
+	case MI_TAXI:
+	case MI_POLICE:
+	case MI_ENFORCER:
+	case MI_BUS:
+	case MI_RHINO:
+	case MI_BARRACKS:
+	case MI_DODO:
+	case MI_COACH:
+	case MI_CABBIE:
+	case MI_RCBANDIT:
+	case MI_BORGNINE:
+		return false;
+	default:
+		return true;
 	}
-	return false;
 }
 
 bool