From 702da55ec9d0e8e02df25a26390a113e452676e3 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 3 May 2020 15:57:57 +0200
Subject: implemented most of vice city path system

---
 src/core/Pad.cpp   |  2 +-
 src/core/World.cpp |  4 ++--
 src/core/config.h  | 11 +++++++++++
 src/core/re3.cpp   |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/core')

diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index c4c4a69e..da86d15e 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -106,7 +106,7 @@ void TankCheat()
 		CAutomobile *tank = new CAutomobile(MI_RHINO, MISSION_VEHICLE);
 #endif
 		if (tank != nil) {
-			CVector pos = ThePaths.m_pathNodes[node].pos;
+			CVector pos = ThePaths.m_pathNodes[node].GetPosition();
 			pos.z += 4.0f;
 			tank->SetPosition(pos);
 			tank->SetOrientation(0.0f, 0.0f, DEGTORAD(200.0f));
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 30d086df..2833c59c 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -1618,7 +1618,7 @@ CWorld::RemoveFallenPeds(void)
 				if(ped->CharCreatedBy != RANDOM_CHAR || ped->IsPlayer()) {
 					int closestNode = ThePaths.FindNodeClosestToCoors(ped->GetPosition(), PATH_PED,
 					                                                  999999.9f, false, false);
-					CVector newPos = ThePaths.m_pathNodes[closestNode].pos;
+					CVector newPos = ThePaths.m_pathNodes[closestNode].GetPosition();
 					newPos.z += 2.0f;
 					ped->Teleport(newPos);
 					ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
@@ -1642,7 +1642,7 @@ CWorld::RemoveFallenCars(void)
 				   (veh->pDriver && veh->pDriver->IsPlayer())) {
 					int closestNode = ThePaths.FindNodeClosestToCoors(veh->GetPosition(), PATH_CAR,
 					                                                  999999.9f, false, false);
-					CVector newPos = ThePaths.m_pathNodes[closestNode].pos;
+					CVector newPos = ThePaths.m_pathNodes[closestNode].GetPosition();
 					newPos.z += 3.0f;
 					veh->Teleport(newPos);
 					veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
diff --git a/src/core/config.h b/src/core/config.h
index 7c1fab5b..86189920 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -41,10 +41,17 @@ enum Config {
 	NUMTEMPOBJECTS = 30,
 
 	// Path data
+#ifndef MIAMI
 	NUM_PATHNODES = 4930,
 	NUM_CARPATHLINKS = 2076,
 	NUM_MAPOBJECTS = 1250,
 	NUM_PATHCONNECTIONS = 10260,
+#else
+	NUM_PATHNODES = 9650,
+	NUM_CARPATHLINKS = 3500,
+	NUM_MAPOBJECTS = 1250,
+	NUM_PATHCONNECTIONS = 20400,
+#endif
 
 	// Link list lengths
 	NUMALPHALIST = 20,
@@ -110,7 +117,11 @@ enum Config {
 	NUMMODELSPERPEDGROUP = 8,
 	NUMSHOTINFOS = 100,
 
+#ifndef MIAMI
 	NUMROADBLOCKS = 600,
+#else
+	NUMROADBLOCKS = 300,
+#endif
 
 	NUMVISIBLEENTITIES = 2000,
 	NUMINVISIBLEENTITIES = 150,
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index e6409523..44253c14 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -118,7 +118,7 @@ SpawnCar(int id)
 		if(CModelInfo::IsBoatModel(id))
 			v->SetPosition(TheCamera.GetPosition() + TheCamera.GetForward()*15.0f);
 		else
-			v->SetPosition(ThePaths.m_pathNodes[node].pos);
+			v->SetPosition(ThePaths.m_pathNodes[node].GetPosition());
 
 		v->GetMatrix().GetPosition().z += 4.0f;
 		v->SetOrientation(0.0f, 0.0f, 3.49f);
-- 
cgit v1.2.3