summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/control/AutoPilot.cpp4
-rw-r--r--src/control/AutoPilot.h21
-rw-r--r--src/control/CarAI.cpp267
-rw-r--r--src/control/CarAI.h15
-rw-r--r--src/control/CarCtrl.cpp14
-rw-r--r--src/control/CarCtrl.h3
-rw-r--r--src/control/PathFind.cpp555
-rw-r--r--src/control/PathFind.h149
-rw-r--r--src/control/Record.cpp3
-rw-r--r--src/control/RoadBlocks.cpp26
-rw-r--r--src/control/RoadBlocks.h4
-rw-r--r--src/control/Script.h3
12 files changed, 1 insertions, 1063 deletions
diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index da661b8c..b1fce95f 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -6,7 +6,6 @@
#include "Curves.h"
#include "PathFind.h"
-//--MIAMI: done
void CAutoPilot::ModifySpeed(float speed)
{
m_fMaxTrafficSpeed = Max(0.01f, speed);
@@ -40,7 +39,6 @@ void CAutoPilot::ModifySpeed(float speed)
#endif
}
-//--MIAMI: done
void CAutoPilot::RemoveOnePathNode()
{
--m_nPathFindNodesCount;
@@ -49,7 +47,6 @@ void CAutoPilot::RemoveOnePathNode()
}
#ifdef COMPATIBLE_SAVES
-//--MIAMI: TODO
void CAutoPilot::Save(uint8*& buf)
{
WriteSaveBuf<int32>(buf, m_nCurrentRouteNode);
@@ -89,7 +86,6 @@ void CAutoPilot::Save(uint8*& buf)
SkipSaveBuf(buf, 6);
}
-//--MIAMI: TODO
void CAutoPilot::Load(uint8*& buf)
{
m_nCurrentRouteNode = ReadSaveBuf<int32>(buf);
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index 48a0c4de..345f4cb4 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -26,15 +26,6 @@ enum eCarMission : uint8
MISSION_BLOCKCAR_FARAWAY,
MISSION_BLOCKCAR_CLOSE,
MISSION_BLOCKCAR_HANDBRAKESTOP,
-#ifdef MIAMI
- MISSION_HELI_FLYTOCOORS,
- MISSION_ATTACKPLAYER,
- MISSION_PLANE_FLYTOCOORS,
- MISSION_HELI_LAND,
- MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1,
- MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2,
- MISSION_BLOCKPLAYER_FORWARDANDBACK
-#endif
};
enum eCarTempAction : uint8
@@ -84,18 +75,11 @@ public:
uint32 m_nTimeTempAction;
float m_fMaxTrafficSpeed;
uint8 m_nCruiseSpeed;
-#ifdef MIAMI
- uint8 m_nCruiseSpeedMultiplierType;
- float m_fCruiseSpeedMultiplier;
-#endif
uint8 m_bSlowedDownBecauseOfCars : 1;
uint8 m_bSlowedDownBecauseOfPeds : 1;
uint8 m_bStayInCurrentLevel : 1;
uint8 m_bStayInFastLane : 1;
uint8 m_bIgnorePathfinding : 1;
-#ifdef MIAMI
- uint8 m_nSwitchDistance;
-#endif
CVector m_vecDestinationCoors;
CPathNode *m_aPathFindNodesInfo[NUM_PATH_NODES_IN_AUTOPILOT];
int16 m_nPathFindNodesCount;
@@ -125,10 +109,6 @@ public:
m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
m_nAntiReverseTimer = m_nTimeToStartMission;
m_bStayInFastLane = false;
-#ifdef MIAMI
- m_nCruiseSpeedMultiplierType = 0;
- m_fCruiseSpeedMultiplier = 1.0f;
-#endif
}
void ModifySpeed(float);
@@ -139,3 +119,4 @@ public:
#endif
};
+static_assert(sizeof(CAutoPilot) == 0x70, "CAutoPilot: error"); \ No newline at end of file
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index d595feaf..091f971b 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -21,23 +21,16 @@
#define DISTANCE_TO_SWITCH_DISTANCE_GOTO 20.0f
-//--MIAMI: done
float CCarAI::FindSwitchDistanceClose(CVehicle* pVehicle)
{
-#ifndef MIAMI
return 30.0f;
-#else
- return pVehicle->AutoPilot.m_nSwitchDistance;
-#endif
}
-//--MIAMI: done
float CCarAI::FindSwitchDistanceFarNormalVehicle(CVehicle* pVehicle)
{
return FindSwitchDistanceClose(pVehicle) + 5.0f;
}
-//--MIAMI: done
float CCarAI::FindSwitchDistanceFar(CVehicle* pVehicle)
{
if (pVehicle->bIsLawEnforcer)
@@ -45,23 +38,6 @@ float CCarAI::FindSwitchDistanceFar(CVehicle* pVehicle)
return FindSwitchDistanceFarNormalVehicle(pVehicle);
}
-#ifdef MIAMI
-//--MIAMI: done
-void CCarAI::BackToCruisingIfNoWantedLevel(CVehicle* pVehicle)
-{
- if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
- (FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
- CCarCtrl::JoinCarWithRoadSystem(pVehicle);
- pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
- pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
- pVehicle->m_bSirenOrAlarm = false;
- if (CCullZones::NoPolice())
- pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
- }
-}
-#endif
-
-//--MIAMI: done
void CCarAI::UpdateCarAI(CVehicle* pVehicle)
{
if (pVehicle->bIsLawEnforcer){
@@ -91,7 +67,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (pVehicle->UsesSiren(pVehicle->GetModelIndex()))
pVehicle->m_bSirenOrAlarm = true;
}
-#ifndef MIAMI
if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
CCarCtrl::JoinCarWithRoadSystem(pVehicle);
@@ -101,9 +76,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (CCullZones::NoPolice())
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
}
-#else
- BackToCruisingIfNoWantedLevel(pVehicle);
-#endif
break;
case MISSION_RAMPLAYER_CLOSE:
if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
@@ -148,11 +120,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->m_bSirenOrAlarm = false;
pVehicle->m_nCarHornTimer = 0;
}
-#ifdef MIAMI
- if (pVehicle->bIsLawEnforcer)
- MellowOutChaseSpeed(pVehicle);
- BackToCruisingIfNoWantedLevel(pVehicle);
-#else
if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())){
CCarCtrl::JoinCarWithRoadSystem(pVehicle);
@@ -165,7 +132,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
else if (pVehicle->bIsLawEnforcer)
MellowOutChaseSpeed(pVehicle);
-#endif
break;
case MISSION_BLOCKPLAYER_FARAWAY:
if (FindSwitchDistanceClose(pVehicle) > (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
@@ -174,7 +140,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (pVehicle->UsesSiren(pVehicle->GetModelIndex()))
pVehicle->m_bSirenOrAlarm = true;
}
-#ifndef MIAMI
if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
CCarCtrl::JoinCarWithRoadSystem(pVehicle);
@@ -184,9 +149,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (CCullZones::NoPolice())
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
}
-#else
- BackToCruisingIfNoWantedLevel(pVehicle);
-#endif
break;
case MISSION_BLOCKPLAYER_CLOSE:
if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
@@ -216,11 +178,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->m_bSirenOrAlarm = false;
pVehicle->m_nCarHornTimer = 0;
}
-#ifdef MIAMI
- if (pVehicle->bIsLawEnforcer)
- MellowOutChaseSpeed(pVehicle);
- BackToCruisingIfNoWantedLevel(pVehicle);
-#else
if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
CCarCtrl::JoinCarWithRoadSystem(pVehicle);
@@ -235,11 +192,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
#endif
break;
case MISSION_GOTOCOORDS:
-#ifdef MIAMI
- if ((pVehicle->AutoPilot.m_vecDestinationCoors - pVehicle->GetPosition()).Magnitude2D() < FindSwitchDistanceClose(pVehicle) ||
-#else
if ((pVehicle->AutoPilot.m_vecDestinationCoors - pVehicle->GetPosition()).Magnitude2D() < DISTANCE_TO_SWITCH_DISTANCE_GOTO ||
-#endif
pVehicle->AutoPilot.m_bIgnorePathfinding)
pVehicle->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_STRAIGHT;
break;
@@ -251,12 +204,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (distance < 5.0f){
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
-#ifdef MIAMI
- if (pVehicle->bParking) {
- TellOccupantsToLeaveCar(pVehicle);
- pVehicle->bParking = false;
- }
-#endif
}
else if (distance > FindSwitchDistanceFarNormalVehicle(pVehicle) && !pVehicle->AutoPilot.m_bIgnorePathfinding && (CTimer::GetFrameCounter() & 7) == 0){
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
@@ -313,12 +260,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (distance < 1.0f) {
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
-#ifdef MIAMI
- if (pVehicle->bParking) {
- TellOccupantsToLeaveCar(pVehicle);
- pVehicle->bParking = false;
- }
-#endif
}
else if (distance > FindSwitchDistanceFarNormalVehicle(pVehicle) && !pVehicle->AutoPilot.m_bIgnorePathfinding && (CTimer::GetFrameCounter() & 7) == 0) {
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
@@ -338,7 +279,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
break;
case MISSION_RAMCAR_CLOSE:
if (pVehicle->AutoPilot.m_pTargetCar){
-#ifndef MIAMI
if
#ifdef FIX_BUGS
(FindPlayerVehicle() == pVehicle->AutoPilot.m_pTargetCar &&
@@ -356,12 +296,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (CCullZones::NoPolice())
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
}
-#else
-#ifdef FIX_BUGS // btw fixed in SA
- if (FindPlayerVehicle() == pVehicle->AutoPilot.m_pTargetCar)
-#endif
- BackToCruisingIfNoWantedLevel(pVehicle);
-#endif
if ((pVehicle->AutoPilot.m_pTargetCar->GetPosition() - pVehicle->GetPosition()).Magnitude2D() <= FindSwitchDistanceFar(pVehicle) ||
pVehicle->AutoPilot.m_bIgnorePathfinding){
if (pVehicle->GetHasCollidedWith(pVehicle->AutoPilot.m_pTargetCar)){
@@ -403,42 +337,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
}
break;
-#ifdef MIAMI
- case MISSION_ATTACKPLAYER:
- if (pVehicle->bIsLawEnforcer)
- MellowOutChaseSpeedBoat(pVehicle);
- BackToCruisingIfNoWantedLevel(pVehicle);
- break;
- case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1:
- if (((CVector2D)(pVehicle->AutoPilot.m_vecDestinationCoors) - pVehicle->GetPosition()).Magnitude() < 1.5f)
- pVehicle->AutoPilot.m_nCarMission = MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2;
- BackToCruisingIfNoWantedLevel(pVehicle);
- break;
- case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2:
- {
- float distance = ((CVector2D)FindPlayerCoors() - pVehicle->GetPosition()).Magnitude();
- if (distance < 13.0f) {
- TellOccupantsToLeaveCar(pVehicle);
- pVehicle->AutoPilot.m_nCruiseSpeed = 0;
- pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
- }
- if (distance > 70.0f || FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone ||
- (FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
- TellOccupantsToLeaveCar(pVehicle);
- pVehicle->AutoPilot.m_nCruiseSpeed = 0;
- pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
- }
- break;
- }
- case MISSION_BLOCKPLAYER_FORWARDANDBACK:
- {
- CVector2D diff = (CVector2D)FindPlayerCoors() - pVehicle->GetPosition();
- float distance = Max(0.001f, diff.Magnitude());
- if (!FindPlayerVehicle() || DotProduct2D(CVector2D(diff.x / distance, diff.y / distance), FindPlayerSpeed()) > 0.05f)
- pVehicle->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_CLOSE;
- BackToCruisingIfNoWantedLevel(pVehicle);
- }
-#endif
default:
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && !CCullZones::NoPolice()){
if (ABS(FindPlayerCoors().x - pVehicle->GetPosition().x) > 10.0f ||
@@ -446,9 +344,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCruiseSpeed = FindPoliceCarSpeedForWantedLevel(pVehicle);
pVehicle->SetStatus(STATUS_PHYSICS);
pVehicle->AutoPilot.m_nCarMission =
-#ifdef MIAMI
- pVehicle->GetVehicleAppearance() == VEHICLE_BOAT ? FindPoliceBoatMissionForWantedLevel() :
-#endif
FindPoliceCarMissionForWantedLevel();
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
@@ -470,13 +365,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
break;
}
-#ifdef MIAMI
- if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel >= 1 && CCullZones::PoliceAbandonCars()) {
- TellOccupantsToLeaveCar(pVehicle);
- pVehicle->AutoPilot.m_nCruiseSpeed = 0;
- pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
- }
-#endif
float flatSpeed = pVehicle->GetMoveSpeed().MagnitudeSqr2D();
if (flatSpeed > SQR(0.018f)){
pVehicle->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
@@ -485,16 +373,9 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if (pVehicle->GetStatus() == STATUS_PHYSICS && pVehicle->AutoPilot.m_nTempAction == TEMPACT_NONE){
if (pVehicle->AutoPilot.m_nCarMission != MISSION_NONE){
if (pVehicle->AutoPilot.m_nCarMission != MISSION_STOP_FOREVER &&
-#ifdef MIAMI
- pVehicle->AutoPilot.m_nCarMission != MISSION_BLOCKPLAYER_HANDBRAKESTOP &&
-#endif
pVehicle->AutoPilot.m_nCruiseSpeed != 0 &&
(pVehicle->VehicleCreatedBy != RANDOM_VEHICLE || pVehicle->AutoPilot.m_nCarMission != MISSION_CRUISE)){
if (pVehicle->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_STOP_FOR_CARS
-#ifdef MIAMI
- && pVehicle->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS ||
- pVehicle->VehicleCreatedBy == MISSION_VEHICLE
-#endif
) {
if (CTimer::GetTimeInMilliseconds() - pVehicle->m_nLastTimeCollided > 500)
pVehicle->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
@@ -526,15 +407,6 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 400;
}
}
-#ifdef MIAMI
- if (pVehicle->bIsLawEnforcer) {
- if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_FARAWAY ||
- pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE) {
- if (FindPlayerVehicle() && FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BIKE)
- pVehicle->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FARAWAY;
- }
- }
-#endif
if (pVehicle->GetUp().z < 0.7f){
pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
@@ -574,45 +446,13 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
if ((uint8)(pVehicle->m_randomSeed ^ CGeneral::GetRandomNumber()) == 0xAD)
pVehicle->m_nCarHornTimer = 45;
}
-#ifdef MIAMI
- float target = 1.0f;
- if (pVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE)
- target = CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(pVehicle->AutoPilot.m_nCruiseSpeedMultiplierType);
- float change = CTimer::GetTimeStep() * 0.01f;
- if (Abs(pVehicle->AutoPilot.m_fCruiseSpeedMultiplier - target) < change)
- pVehicle->AutoPilot.m_fCruiseSpeedMultiplier = target;
- else if (pVehicle->AutoPilot.m_fCruiseSpeedMultiplier > target)
- pVehicle->AutoPilot.m_fCruiseSpeedMultiplier -= change;
- else
- pVehicle->AutoPilot.m_fCruiseSpeedMultiplier += change;
-
- if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0) {
- if (!FindPlayerVehicle() ||
- FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_CAR ||
- FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BIKE) {
- if (pVehicle->GetVehicleAppearance() == VEHICLE_BOAT) {
- pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
- pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
- }
- }
- else if (FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BOAT) {
- if (pVehicle->GetVehicleAppearance() == VEHICLE_CAR ||
- pVehicle->GetVehicleAppearance() == VEHICLE_BIKE) {
- pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
- pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
- }
- }
- }
-#endif
}
-//--MIAMI: done
void CCarAI::CarHasReasonToStop(CVehicle* pVehicle)
{
pVehicle->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
}
-//--MIAMI: done
float CCarAI::GetCarToGoToCoors(CVehicle* pVehicle, CVector* pTarget)
{
if (pVehicle->AutoPilot.m_nCarMission != MISSION_GOTOCOORDS && pVehicle->AutoPilot.m_nCarMission != MISSION_GOTOCOORDS_STRAIGHT){
@@ -630,18 +470,6 @@ float CCarAI::GetCarToGoToCoors(CVehicle* pVehicle, CVector* pTarget)
return (pVehicle->GetPosition() - *pTarget).Magnitude2D();
}
-#ifdef MIAMI
-//--MIAMI: done
-float CCarAI::GetCarToParkAtCoors(CVehicle* pVehicle, CVector* pTarget)
-{
- GetCarToGoToCoors(pVehicle, pTarget);
- pVehicle->bParking = true;
- pVehicle->AutoPilot.m_nCruiseSpeed = 10;
- return (pVehicle->GetPosition() - *pTarget).Magnitude2D();
-}
-#endif
-
-//--MIAMI: TODO: MI_VICECHEE
void CCarAI::AddPoliceCarOccupants(CVehicle* pVehicle)
{
if (pVehicle->bOccupantsHaveBeenGenerated)
@@ -661,43 +489,23 @@ void CCarAI::AddPoliceCarOccupants(CVehicle* pVehicle)
if (FindPlayerPed()->m_pWanted->m_nWantedLevel > 1)
pVehicle->SetupPassenger(0);
return;
-#ifdef MIAMI
- case MI_PREDATOR:
- pVehicle->SetUpDriver();
- return;
-//TODO(MIAMI) uncomment this when we have MI_VICECHEE
-/*
- case MI_VICECHEE:
- {
- pVehicle->SetUpDriver()->bIsMiamiViceCop = true;
- pVehicle->SetUpPassenger(0)->bIsMiamiViceCop = true;
- CPopulation::NumMiamiViceCops += 2;
- CCarCtrl::MiamiViceCycle = (CCarCtrl::MiamiViceCycle + 1) % 4;
- CCarCtrl::LastTimeMiamiViceGenerated = CTimer::GetTimeInMilliseconds();
- return;
- }
-*/
-#endif
default:
return;
}
}
-//--MIAMI: done
void CCarAI::AddAmbulanceOccupants(CVehicle* pVehicle)
{
pVehicle->SetUpDriver();
pVehicle->SetupPassenger(1);
}
-//--MIAMI: done
void CCarAI::AddFiretruckOccupants(CVehicle* pVehicle)
{
pVehicle->SetUpDriver();
pVehicle->SetupPassenger(0);
}
-//--MIAMI: done
void CCarAI::TellOccupantsToLeaveCar(CVehicle* pVehicle)
{
if (pVehicle->pDriver){
@@ -708,38 +516,11 @@ void CCarAI::TellOccupantsToLeaveCar(CVehicle* pVehicle)
int timer = 100;
for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++){
if (pVehicle->pPassengers[i]) {
-#ifdef MIAMI
- pVehicle->pPassengers[i]->m_leaveCarTimer = timer;
pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
- timer += CGeneral::GetRandomNumberInRange(200, 400);
-#else
- pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
-#endif
- }
- }
-}
-
-#ifdef MIAMI
-//--MIAMI: done
-void CCarAI::TellOccupantsToFleeCar(CVehicle* pVehicle)
-{
- if (pVehicle->pDriver && !pVehicle->pDriver->IsPlayer()) {
- pVehicle->pDriver->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
- if (pVehicle->GetModelIndex() != MI_FIRETRUCK && pVehicle->GetModelIndex() == MI_AMBULAN)
- pVehicle->pDriver->Say(SOUND_PED_LEAVE_VEHICLE);
- }
- int timer = 100;
- for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++) {
- if (pVehicle->pPassengers[i]) {
- pVehicle->pPassengers[i]->m_leaveCarTimer = timer;
- pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
- timer += CGeneral::GetRandomNumberInRange(200, 400);
}
}
}
-#endif
-//--MIAMI: done
void CCarAI::TellCarToRamOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
{
pVehicle->AutoPilot.m_pTargetCar = pTarget;
@@ -749,7 +530,6 @@ void CCarAI::TellCarToRamOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
pVehicle->AutoPilot.m_nCruiseSpeed = Max(6, pVehicle->AutoPilot.m_nCruiseSpeed);
}
-//--MIAMI: done
void CCarAI::TellCarToBlockOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
{
pVehicle->AutoPilot.m_pTargetCar = pTarget;
@@ -759,7 +539,6 @@ void CCarAI::TellCarToBlockOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
pVehicle->AutoPilot.m_nCruiseSpeed = Max(6, pVehicle->AutoPilot.m_nCruiseSpeed);
}
-//--MIAMI: done
eCarMission CCarAI::FindPoliceCarMissionForWantedLevel()
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel){
@@ -774,24 +553,6 @@ eCarMission CCarAI::FindPoliceCarMissionForWantedLevel()
}
}
-#ifdef MIAMI
-//--MIAMI: done
-eCarMission CCarAI::FindPoliceBoatMissionForWantedLevel()
-{
- switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
- case 0:
- case 1: return MISSION_BLOCKPLAYER_FARAWAY;
- case 2:
- case 3:
- case 4:
- case 5:
- case 6: return MISSION_ATTACKPLAYER;
- default: return MISSION_BLOCKPLAYER_FARAWAY;
- }
-}
-#endif
-
-//--MIAMI: done
int32 CCarAI::FindPoliceCarSpeedForWantedLevel(CVehicle* pVehicle)
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
@@ -806,7 +567,6 @@ int32 CCarAI::FindPoliceCarSpeedForWantedLevel(CVehicle* pVehicle)
}
}
-//--MIAMI: done
void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
{
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel == 1){
@@ -845,31 +605,8 @@ void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCruiseSpeed = 34;
}
}
-#ifdef MIAMI
- if (!FindPlayerVehicle() && FindPlayerPed()->GetMoveSpeed().Magnitude() < 0.07f) {
- if ((FindPlayerCoors() - pVehicle->GetPosition()).Magnitude() < 30.0f)
- pVehicle->AutoPilot.m_nCruiseSpeed = Min(10, pVehicle->AutoPilot.m_nCruiseSpeed);
- }
-#endif
}
-#ifdef MIAMI
-//--MIAMI: done
-void CCarAI::MellowOutChaseSpeedBoat(CVehicle* pVehicle)
-{
- switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
- case 0: pVehicle->AutoPilot.m_nCruiseSpeed = 8; break;
- case 1: pVehicle->AutoPilot.m_nCruiseSpeed = 10; break;
- case 2: pVehicle->AutoPilot.m_nCruiseSpeed = 15; break;
- case 3: pVehicle->AutoPilot.m_nCruiseSpeed = 20; break;
- case 4: pVehicle->AutoPilot.m_nCruiseSpeed = 25; break;
- case 5: pVehicle->AutoPilot.m_nCruiseSpeed = 30; break;
- case 6: pVehicle->AutoPilot.m_nCruiseSpeed = 40; break;
- }
-}
-#endif
-
-//--MIAMI: done
void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
{
float flatSpeed = pVehicle->GetMoveSpeed().Magnitude2D();
@@ -892,10 +629,6 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
continue;
if (vehicle == pVehicle)
continue;
-#ifdef MIAMI
- if (vehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_AVOID_CARS)
- return;
-#endif
if (Abs(pVehicle->GetPosition().z - vehicle->GetPosition().z) >= 5.0f)
continue;
CVector2D distance = vehicle->GetPosition() - pVehicle->GetPosition();
diff --git a/src/control/CarAI.h b/src/control/CarAI.h
index 9c3cb196..e88807c8 100644
--- a/src/control/CarAI.h
+++ b/src/control/CarAI.h
@@ -10,32 +10,17 @@ public:
static float FindSwitchDistanceClose(CVehicle*);
static float FindSwitchDistanceFarNormalVehicle(CVehicle*);
static float FindSwitchDistanceFar(CVehicle*);
-#ifdef MIAMI
- static void BackToCruisingIfNoWantedLevel(CVehicle*);
-#endif
static void UpdateCarAI(CVehicle*);
static void CarHasReasonToStop(CVehicle*);
static float GetCarToGoToCoors(CVehicle*, CVector*);
-#ifdef MIAMI
- static float GetCarToParkAtCoors(CVehicle*, CVector*);
-#endif
static void AddPoliceCarOccupants(CVehicle*);
static void AddAmbulanceOccupants(CVehicle*);
static void AddFiretruckOccupants(CVehicle*);
static void TellOccupantsToLeaveCar(CVehicle*);
-#ifdef MIAMI
- static void TellOccupantsToFleeCar(CVehicle*);
-#endif
static void TellCarToRamOtherCar(CVehicle*, CVehicle*);
static void TellCarToBlockOtherCar(CVehicle*, CVehicle*);
static eCarMission FindPoliceCarMissionForWantedLevel();
-#ifdef MIAMI
- static eCarMission FindPoliceBoatMissionForWantedLevel();
-#endif
static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*);
static void MellowOutChaseSpeed(CVehicle*);
-#ifdef MIAMI
- static void MellowOutChaseSpeedBoat(CVehicle*);
-#endif
static void MakeWayForCarWithSiren(CVehicle *veh);
};
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 927a0070..db6139b9 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -1641,7 +1641,6 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
CPathNode* pTargetNode;
int16 numNodes;
float distanceToTargetNode;
-#ifndef MIAMI
if (pTarget && pTarget->m_pCurGroundEntity &&
pTarget->m_pCurGroundEntity->IsBuilding() &&
((CBuilding*)pTarget->m_pCurGroundEntity)->GetIsATreadable() &&
@@ -1667,7 +1666,6 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
#endif
&pTargetNode, &numNodes, 1, pVehicle, &distanceToTargetNode, 999999.9f, closestNode);
}else
-#endif
{
ThePaths.DoPathSearch(0, pCurNode->GetPosition(), curNode,
@@ -2751,15 +2749,3 @@ bool CCarCtrl::MapCouldMoveInThisArea(float x, float y)
return false;
#endif
}
-
-#ifdef MIAMI
-float CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(int8 type)
-{
- switch (type)
- {
- case 1: return 1.5f;
- case 2: return 2.0f;
- }
- return 1.0f;
-}
-#endif
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h
index 8ac8664a..44ef9ab6 100644
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -104,9 +104,6 @@ public:
static void ClearInterestingVehicleList();
static void FindLinksToGoWithTheseNodes(CVehicle*);
static bool GenerateOneEmergencyServicesCar(uint32, CVector);
-#ifdef MIAMI
- static float FindSpeedMultiplierWithSpeedFromNodes(int8);
-#endif
static float GetPositionAlongCurrentCurve(CVehicle* pVehicle)
{
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index b8203821..c278cf35 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -18,16 +18,9 @@ CPathFind ThePaths;
#define MIN_PED_ROUTE_DISTANCE 23.8f
-#ifdef MIAMI
-#define NUMTEMPNODES 5000
-#define NUMDETACHED_CARS 1024
-#define NUMDETACHED_PEDS 1214
-#define NUMTEMPEXTERNALNODES 4600
-#else
#define NUMTEMPNODES 4000
#define NUMDETACHED_CARS 100
#define NUMDETACHED_PEDS 50
-#endif
// object flags:
@@ -37,18 +30,9 @@ CPathFind ThePaths;
CPathInfoForObject *InfoForTileCars;
CPathInfoForObject *InfoForTilePeds;
-#ifndef MIAMI
// unused
CTempDetachedNode *DetachedNodesCars;
CTempDetachedNode *DetachedNodesPeds;
-#else
-CPathInfoForObject *DetachedInfoForTileCars;
-CPathInfoForObject *DetachedInfoForTilePeds;
-CTempNodeExternal *TempExternalNodes;
-int32 NumTempExternalNodes;
-int32 NumDetachedPedNodeGroups;
-int32 NumDetachedCarNodeGroups;
-#endif
bool
CPedPath::CalcPedRoute(int8 pathType, CVector position, CVector destination, CVector *pointPoses, int16 *pointsFound, int16 maxPoints)
@@ -243,28 +227,6 @@ CPedPath::AddBlockade(CEntity *pEntity, CPedPathNode(*pathNodes)[40], CVector *p
}
}
-#ifdef MIAMI
-// Make sure all externals link TO an internal
-void
-CPathInfoForObject::SwapConnectionsToBeRightWayRound(void)
-{
- int e, i;
- CPathInfoForObject *tile = this;
-
- for(e = 0; e < 12; e++)
- if(tile[e].type == NodeTypeExtern && tile[e].next < 0)
- for(i = 0; i < 12; i++)
- if(tile[i].type == NodeTypeIntern && tile[i].next == e){
- tile[e].next = i;
- tile[i].next = -1;
- bool tmp = !!tile[e].crossing;
- tile[e].crossing = tile[i].crossing;
- tile[i].crossing = tmp;
- }
-}
-#endif
-
-//--MIAMI: done
void
CPathFind::Init(void)
{
@@ -275,15 +237,11 @@ CPathFind::Init(void)
m_numConnections = 0;
m_numCarPathLinks = 0;
unk = 0;
-#ifdef MIAMI
- NumTempExternalNodes = 0;
-#endif
for(i = 0; i < NUM_PATHNODES; i++)
m_pathNodes[i].distance = MAX_DIST;
}
-//--MIAMI: done
void
CPathFind::AllocatePathFindInfoMem(int16 numPathGroups)
{
@@ -298,7 +256,6 @@ CPathFind::AllocatePathFindInfoMem(int16 numPathGroups)
InfoForTilePeds = new CPathInfoForObject[12*numPathGroups];
memset(InfoForTilePeds, 0, 12*numPathGroups*sizeof(CPathInfoForObject));
-#ifndef MIAMI
// unused
delete[] DetachedNodesCars;
DetachedNodesCars = nil;
@@ -308,32 +265,14 @@ CPathFind::AllocatePathFindInfoMem(int16 numPathGroups)
memset(DetachedNodesCars, 0, NUMDETACHED_CARS*sizeof(CTempDetachedNode));
DetachedNodesPeds = new CTempDetachedNode[NUMDETACHED_PEDS];
memset(DetachedNodesPeds, 0, NUMDETACHED_PEDS*sizeof(CTempDetachedNode));
-#else
- delete[] DetachedInfoForTileCars;
- DetachedInfoForTileCars = nil;
- delete[] DetachedInfoForTilePeds;
- DetachedInfoForTilePeds = nil;
- DetachedInfoForTileCars = new CPathInfoForObject[12*NUMDETACHED_CARS];
- memset(DetachedInfoForTileCars, 0, 12*NUMDETACHED_CARS*sizeof(CPathInfoForObject));
- DetachedInfoForTilePeds = new CPathInfoForObject[12*NUMDETACHED_PEDS];
- memset(DetachedInfoForTilePeds, 0, 12*NUMDETACHED_PEDS*sizeof(CPathInfoForObject));
-
- TempExternalNodes = new CTempNodeExternal[NUMTEMPEXTERNALNODES];
- memset(TempExternalNodes, 0, NUMTEMPEXTERNALNODES*sizeof(CTempNodeExternal));
- NumTempExternalNodes = 0;
- NumDetachedPedNodeGroups = 0;
- NumDetachedCarNodeGroups = 0;
-#endif
}
-//--MIAMI: done
void
CPathFind::RegisterMapObject(CTreadable *mapObject)
{
m_mapObjects[m_numMapObjects++] = mapObject;
}
-//--MIAMI: TODO: implement all the arguments once we can load the VC map
void
CPathFind::StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, bool crossing)
{
@@ -342,27 +281,13 @@ CPathFind::StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x,
i = id*12 + node;
InfoForTilePeds[i].type = type;
InfoForTilePeds[i].next = next;
-#ifndef MIAMI
InfoForTilePeds[i].x = x;
InfoForTilePeds[i].y = y;
InfoForTilePeds[i].z = z;
-#else
- InfoForTilePeds[i].x = x/16.0f;
- InfoForTilePeds[i].y = y/16.0f;
- InfoForTilePeds[i].z = z/16.0f;
-#endif
InfoForTilePeds[i].numLeftLanes = 0;
InfoForTilePeds[i].numRightLanes = 0;
InfoForTilePeds[i].crossing = crossing;
-#ifdef MIAMI
- InfoForTilePeds[i].flag02 = false;
- InfoForTilePeds[i].roadBlock = false;
- InfoForTilePeds[i].disabled = false;
- InfoForTilePeds[i].waterPath = false;
- InfoForTilePeds[i].betweenLevels = false;
-#endif
-#ifndef MIAMI
if(type)
for(i = 0; i < node; i++){
j = id*12 + i;
@@ -373,13 +298,8 @@ CPathFind::StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x,
printf("Modelindex of cullprit: %d\n\n", id);
}
}
-#else
- if(node == 11)
- InfoForTilePeds[id*12].SwapConnectionsToBeRightWayRound();
-#endif
}
-//--MIAMI: TODO: implement all the arguments once we can load the VC map
void
CPathFind::StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, int8 numLeft, int8 numRight)
{
@@ -388,28 +308,13 @@ CPathFind::StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x,
i = id*12 + node;
InfoForTileCars[i].type = type;
InfoForTileCars[i].next = next;
-#ifndef MIAMI
InfoForTileCars[i].x = x;
InfoForTileCars[i].y = y;
InfoForTileCars[i].z = z;
-#else
- InfoForTileCars[i].x = x/16.0f;
- InfoForTileCars[i].y = y/16.0f;
- InfoForTileCars[i].z = z/16.0f;
-#endif
InfoForTileCars[i].numLeftLanes = numLeft;
InfoForTileCars[i].numRightLanes = numRight;
-#ifdef MIAMI
- InfoForTileCars[i].crossing = false;
- InfoForTileCars[i].flag02 = false;
- InfoForTileCars[i].roadBlock = false;
- InfoForTileCars[i].disabled = false;
- InfoForTileCars[i].waterPath = false;
- InfoForTileCars[i].betweenLevels = false;
-#endif
-#ifndef MIAMI
if(type)
for(i = 0; i < node; i++){
j = id*12 + i;
@@ -420,13 +325,8 @@ CPathFind::StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x,
printf("Modelindex of cullprit: %d\n\n", id);
}
}
-#else
- if(node == 11)
- InfoForTileCars[id*12].SwapConnectionsToBeRightWayRound();
-#endif
}
-#ifndef MIAMI
void
CPathFind::CalcNodeCoors(int16 x, int16 y, int16 z, int id, CVector *out)
{
@@ -436,19 +336,7 @@ CPathFind::CalcNodeCoors(int16 x, int16 y, int16 z, int id, CVector *out)
pos.z = z / 16.0f;
*out = m_mapObjects[id]->GetMatrix() * pos;
}
-#else
-void
-CPathFind::CalcNodeCoors(float x, float y, float z, int id, CVector *out)
-{
- CVector pos;
- pos.x = x;
- pos.y = y;
- pos.z = z;
- *out = m_mapObjects[id]->GetMatrix() * pos;
-}
-#endif
-//--MIAMI: done
bool
CPathFind::LoadPathFindData(void)
{
@@ -456,7 +344,6 @@ CPathFind::LoadPathFindData(void)
return false;
}
-//--MIAMI: done
void
CPathFind::PreparePathData(void)
{
@@ -468,20 +355,14 @@ CPathFind::PreparePathData(void)
printf("PreparePathData\n");
if(!CPathFind::LoadPathFindData() && // empty
InfoForTileCars && InfoForTilePeds &&
-#ifndef MIAMI
DetachedNodesCars && DetachedNodesPeds
-#else
- DetachedInfoForTileCars && DetachedInfoForTilePeds && TempExternalNodes
-#endif
){
tempNodes = new CTempNode[NUMTEMPNODES];
m_numConnections = 0;
-#ifndef MIAMI
for(i = 0; i < PATHNODESIZE; i++)
m_pathNodes[i].unkBits = 0;
-#endif
for(i = 0; i < PATHNODESIZE; i++){
numExtern = 0;
@@ -496,21 +377,6 @@ CPathFind::PreparePathData(void)
printf("ILLEGAL BLOCK. MORE THAN 1 INTERNALS AND NOT 2 EXTERNALS (Modelindex:%d)\n", i);
}
-#ifdef MIAMI
- int numExternDetached, numInternDetached;
- for(i = 0; i < NUMDETACHED_CARS; i++){
- numExternDetached = 0;
- numInternDetached = 0;
- for(j = 0; j < 12; j++){
- if(DetachedInfoForTileCars[i*12 + j].type == NodeTypeExtern)
- numExternDetached++;
- if(DetachedInfoForTilePeds[i*12 + j].type == NodeTypeIntern)
- numInternDetached++;
- }
- // no diagnostic here
- }
-#endif
-
for(i = 0; i < PATHNODESIZE; i++)
for(j = 0; j < 12; j++)
if(InfoForTileCars[i*12 + j].type == NodeTypeExtern){
@@ -522,33 +388,13 @@ CPathFind::PreparePathData(void)
if(InfoForTileCars[i*12 + j].numLeftLanes + InfoForTileCars[i*12 + j].numRightLanes <= 0)
printf("ILLEGAL BLOCK. NO LANES IN NODE (Obj:%d)\n", i);
}
-#ifdef MIAMI
- for(i = 0; i < NUMDETACHED_CARS; i++)
- for(j = 0; j < 12; j++)
- if(DetachedInfoForTilePeds[i*12 + j].type == NodeTypeExtern){
- // MI:%d here but no argument for it
- if(DetachedInfoForTilePeds[i*12 + j].numLeftLanes < 0)
- printf("ILLEGAL BLOCK. NEGATIVE NUMBER OF LANES (Obj:%d)\n", i);
- if(DetachedInfoForTilePeds[i*12 + j].numRightLanes < 0)
- printf("ILLEGAL BLOCK. NEGATIVE NUMBER OF LANES (Obj:%d)\n", i);
- if(DetachedInfoForTilePeds[i*12 + j].numLeftLanes + DetachedInfoForTilePeds[i*12 + j].numRightLanes <= 0)
- printf("ILLEGAL BLOCK. NO LANES IN NODE (Obj:%d)\n", i);
- }
-#endif
m_numPathNodes = 0;
-#ifndef MIAMI
PreparePathDataForType(PATH_CAR, tempNodes, InfoForTileCars, 1.0f, DetachedNodesCars, NUMDETACHED_CARS);
m_numCarPathNodes = m_numPathNodes;
PreparePathDataForType(PATH_PED, tempNodes, InfoForTilePeds, 1.0f, DetachedNodesPeds, NUMDETACHED_PEDS);
-#else
- PreparePathDataForType(PATH_CAR, tempNodes, InfoForTileCars, 1.0f, DetachedInfoForTileCars, NumDetachedCarNodeGroups);
- m_numCarPathNodes = m_numPathNodes;
- PreparePathDataForType(PATH_PED, tempNodes, InfoForTilePeds, 1.0f, DetachedInfoForTilePeds, NumDetachedPedNodeGroups);
-#endif
m_numPedPathNodes = m_numPathNodes - m_numCarPathNodes;
-#ifndef MIAMI
// TODO: figure out what exactly is going on here
// Some roads seem to get a west/east flag
for(i = 0; i < m_numMapObjects; i++){
@@ -587,7 +433,6 @@ CPathFind::PreparePathData(void)
}
}
}
-#endif
delete[] tempNodes;
@@ -599,24 +444,14 @@ CPathFind::PreparePathData(void)
delete[] InfoForTilePeds;
InfoForTilePeds = nil;
-#ifndef MIAMI
delete[] DetachedNodesCars;
DetachedNodesCars = nil;
delete[] DetachedNodesPeds;
DetachedNodesPeds = nil;
-#else
- delete[] DetachedInfoForTileCars;
- DetachedInfoForTileCars = nil;
- delete[] DetachedInfoForTilePeds;
- DetachedInfoForTilePeds = nil;
- delete[] TempExternalNodes;
- TempExternalNodes = nil;
-#endif
}
printf("Done with PreparePathData\n");
}
-//--MIAMI: done
/* String together connected nodes in a list by a flood fill algorithm */
void
CPathFind::CountFloodFillGroups(uint8 type)
@@ -659,13 +494,8 @@ CPathFind::CountFloodFillGroups(uint8 type)
if(node->numLinks == 0){
if(type == PATH_CAR)
-#ifndef MIAMI
printf("Single car node: %f %f %f (%d)\n",
node->GetX(), node->GetY(), node->GetZ(), m_mapObjects[node->objectIndex]->GetModelIndex());
-#else
- printf("Single car node: %f %f %f\n",
- node->GetX(), node->GetY(), node->GetZ());
-#endif
else
printf("Single ped node: %f %f %f\n",
node->GetX(), node->GetY(), node->GetZ());
@@ -693,14 +523,9 @@ CPathFind::CountFloodFillGroups(uint8 type)
int32 TempListLength;
-//--MIAMI: done
void
CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoForObject *objectpathinfo,
-#ifndef MIAMI
float maxdist, CTempDetachedNode *detachednodes, int numDetached)
-#else
- float maxdist, CPathInfoForObject *detachednodes, int numDetached)
-#endif
{
static CVector CoorsXFormed;
int i, j, k, l;
@@ -721,17 +546,11 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
oldNumPathNodes = m_numPathNodes;
oldNumLinks = m_numConnections;
-#ifndef MIAMI
#define OBJECTINDEX(n) (m_pathNodes[(n)].objectIndex)
// Initialize map objects
for(i = 0; i < m_numMapObjects; i++)
for(j = 0; j < 12; j++)
m_mapObjects[i]->m_nodeIndices[type][j] = -1;
-#else
-#define OBJECTINDEX(n) (mapObjIndices[(n)])
- int16 *mapObjIndices = new int16[NUM_PATHNODES];
- NumTempExternalNodes = 0;
-#endif
// Calculate internal nodes, store them and connect them to defining object
for(i = 0; i < m_numMapObjects; i++){
@@ -747,83 +566,16 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
&CoorsXFormed);
m_pathNodes[m_numPathNodes].SetPosition(CoorsXFormed);
OBJECTINDEX(m_numPathNodes) = i;
-#ifndef MIAMI
m_pathNodes[m_numPathNodes].unkBits = 1;
m_mapObjects[i]->m_nodeIndices[type][j] = m_numPathNodes;
-#else
- m_pathNodes[m_numPathNodes].width = objectpathinfo[start + j].width;
- m_pathNodes[m_numPathNodes].speedLimit = objectpathinfo[start + j].speedLimit;
- m_pathNodes[m_numPathNodes].spawnRate = objectpathinfo[start + j].spawnRate;
- m_pathNodes[m_numPathNodes].bUseInRoadBlock = objectpathinfo[start + j].roadBlock;
- m_pathNodes[m_numPathNodes].bDisabled = objectpathinfo[start + j].disabled;
- m_pathNodes[m_numPathNodes].bWaterPath = objectpathinfo[start + j].waterPath;
- m_pathNodes[m_numPathNodes].flagB2 = objectpathinfo[start + j].flag02;
- m_pathNodes[m_numPathNodes].bBetweenLevels = objectpathinfo[start + j].betweenLevels;
-#endif
m_numPathNodes++;
}
-#ifdef MIAMI
- else if(objectpathinfo[start + j].type == NodeTypeExtern){
- CalcNodeCoors(
- objectpathinfo[start + j].x,
- objectpathinfo[start + j].y,
- objectpathinfo[start + j].z,
- i,
- &CoorsXFormed);
- TempExternalNodes[NumTempExternalNodes].pos = CoorsXFormed;
- assert(objectpathinfo[start + j].next >= 0);
- TempExternalNodes[NumTempExternalNodes].next = tileStart + objectpathinfo[start + j].next;
- TempExternalNodes[NumTempExternalNodes].numLeftLanes = objectpathinfo[start + j].numLeftLanes;
- TempExternalNodes[NumTempExternalNodes].numRightLanes = objectpathinfo[start + j].numRightLanes;
- TempExternalNodes[NumTempExternalNodes].width = objectpathinfo[start + j].width;
- TempExternalNodes[NumTempExternalNodes].isCross = !!objectpathinfo[start + j].crossing;
- NumTempExternalNodes++;
- }
-#endif
}
}
-#ifdef MIAMI
- // Same thing for detached nodes
- for(i = 0; i < numDetached; i++){
- tileStart = m_numPathNodes;
- start = 12*i;
- for(j = 0; j < 12; j++){
- if(detachednodes[start + j].type == NodeTypeIntern){
- CVector pos;
- pos.x = detachednodes[start + j].x;
- pos.y = detachednodes[start + j].y;
- pos.z = detachednodes[start + j].z;
- m_pathNodes[m_numPathNodes].SetPosition(pos);
- mapObjIndices[m_numPathNodes] = -(i+1);
- m_pathNodes[m_numPathNodes].width = detachednodes[start + j].width;
- m_pathNodes[m_numPathNodes].speedLimit = detachednodes[start + j].speedLimit;
- m_pathNodes[m_numPathNodes].spawnRate = detachednodes[start + j].spawnRate;
- m_pathNodes[m_numPathNodes].bUseInRoadBlock = detachednodes[start + j].roadBlock;
- m_pathNodes[m_numPathNodes].bDisabled = detachednodes[start + j].disabled;
- m_pathNodes[m_numPathNodes].bWaterPath = detachednodes[start + j].waterPath;
- m_pathNodes[m_numPathNodes].flagB2 = detachednodes[start + j].flag02;
- m_pathNodes[m_numPathNodes].bBetweenLevels = detachednodes[start + j].betweenLevels;
- m_numPathNodes++;
- }else if(detachednodes[start + j].type == NodeTypeExtern){
- TempExternalNodes[NumTempExternalNodes].pos.x = detachednodes[start + j].x;
- TempExternalNodes[NumTempExternalNodes].pos.y = detachednodes[start + j].y;
- TempExternalNodes[NumTempExternalNodes].pos.z = detachednodes[start + j].z;
- assert(detachednodes[start + j].next >= 0);
- TempExternalNodes[NumTempExternalNodes].next = tileStart + detachednodes[start + j].next;
- TempExternalNodes[NumTempExternalNodes].numLeftLanes = detachednodes[start + j].numLeftLanes;
- TempExternalNodes[NumTempExternalNodes].numRightLanes = detachednodes[start + j].numRightLanes;
- TempExternalNodes[NumTempExternalNodes].width = detachednodes[start + j].width;
- TempExternalNodes[NumTempExternalNodes].isCross = !!detachednodes[start + j].crossing;
- NumTempExternalNodes++;
- }
- }
- }
-#endif
// Insert external nodes into TempList
TempListLength = 0;
-#ifndef MIAMI
for(i = 0; i < m_numMapObjects; i++){
start = 12 * m_mapObjects[i]->GetModelIndex();
for(j = 0; j < 12; j++){
@@ -899,62 +651,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
}
}
}
-#else
- for(i = 0; i < NumTempExternalNodes; i++){
- // find closest unconnected node
- nearestId = -1;
- nearestDist = maxdist;
- for(k = 0; k < TempListLength; k++){
- if(tempnodes[k].linkState != 1)
- continue;
- dx = tempnodes[k].pos.x - TempExternalNodes[i].pos.x;
- if(Abs(dx) < nearestDist){
- dy = tempnodes[k].pos.y - TempExternalNodes[i].pos.y;
- if(Abs(dy) < nearestDist){
- nearestDist = Max(Abs(dx), Abs(dy));
- nearestId = k;
- }
- }
- }
-
- if(nearestId < 0){
- // None found, add this one to temp list
- tempnodes[TempListLength].pos = TempExternalNodes[i].pos;
- // link to connecting internal node
- tempnodes[TempListLength].link1 = TempExternalNodes[i].next;
- if(type == PATH_CAR){
- tempnodes[TempListLength].numLeftLanes = TempExternalNodes[i].numLeftLanes;
- tempnodes[TempListLength].numRightLanes = TempExternalNodes[i].numRightLanes;
- }
- tempnodes[TempListLength].width = TempExternalNodes[i].width;
- tempnodes[TempListLength].isCross = TempExternalNodes[i].isCross;
- tempnodes[TempListLength++].linkState = 1;
- }else{
- // Found nearest, connect it to our neighbour
- tempnodes[nearestId].link2 = TempExternalNodes[i].next;
- tempnodes[nearestId].linkState = 2;
-
- // collapse this node with nearest we found
- dx = m_pathNodes[tempnodes[nearestId].link1].GetX() - m_pathNodes[tempnodes[nearestId].link2].GetX();
- dy = m_pathNodes[tempnodes[nearestId].link1].GetY() - m_pathNodes[tempnodes[nearestId].link2].GetY();
- tempnodes[nearestId].pos = (tempnodes[nearestId].pos + TempExternalNodes[i].pos)*0.5f;
- mag = Sqrt(dx*dx + dy*dy);
- tempnodes[nearestId].dirX = dx/mag * 100;
- tempnodes[nearestId].dirY = dy/mag * 100;
- tempnodes[nearestId].width = Max(tempnodes[nearestId].width, TempExternalNodes[i].width);
- if(TempExternalNodes[i].isCross)
- tempnodes[nearestId].isCross = true; // TODO: is this guaranteed to be false otherwise?
- // do something when number of lanes doesn't agree
- if(type == PATH_CAR)
- if(tempnodes[nearestId].numLeftLanes != 0 && tempnodes[nearestId].numRightLanes != 0 &&
- (TempExternalNodes[i].numLeftLanes == 0 || TempExternalNodes[i].numRightLanes == 0)){
- // why switch left and right here?
- tempnodes[nearestId].numLeftLanes = TempExternalNodes[i].numRightLanes;
- tempnodes[nearestId].numRightLanes = TempExternalNodes[i].numLeftLanes;
- }
- }
- }
-#endif
// Loop through previously added internal nodes and link them
for(i = oldNumPathNodes; i < m_numPathNodes; i++){
@@ -977,49 +673,27 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
continue;
dist = (m_pathNodes[i].GetPosition() - m_pathNodes[ConnectedNode(m_numConnections)].GetPosition()).Magnitude();
-#ifndef MIAMI
m_distances[m_numConnections] = dist;
m_connectionFlags[m_numConnections].flags = 0;
-#else
- m_distances[m_numConnections] = Min(dist, 255);
- if(tempnodes[j].isCross)
- m_connections[j] |= 0x8000; // crosses road flag
-#endif
if(type == PATH_CAR){
// IMPROVE: use a goto here
// Find existing car path link
for(k = 0; k < m_numCarPathLinks; k++){
-#ifndef MIAMI
if(m_carPathLinks[k].dir.x == tempnodes[j].dirX &&
m_carPathLinks[k].dir.y == tempnodes[j].dirY &&
m_carPathLinks[k].pos.x == tempnodes[j].pos.x &&
m_carPathLinks[k].pos.y == tempnodes[j].pos.y){
-#else
- if(m_carPathLinks[k].dirX == tempnodes[j].dirX &&
- m_carPathLinks[k].dirY == tempnodes[j].dirY &&
- m_carPathLinks[k].x == (int)(tempnodes[j].pos.x*8.0f) &&
- m_carPathLinks[k].y == (int)(tempnodes[j].pos.y*8.0f)){
-#endif
m_carPathConnections[m_numConnections] = k;
k = m_numCarPathLinks;
}
}
// k is m_numCarPathLinks+1 if we found one
if(k == m_numCarPathLinks){
-#ifndef MIAMI
m_carPathLinks[m_numCarPathLinks].dir.x = tempnodes[j].dirX;
m_carPathLinks[m_numCarPathLinks].dir.y = tempnodes[j].dirY;
m_carPathLinks[m_numCarPathLinks].pos.x = tempnodes[j].pos.x;
m_carPathLinks[m_numCarPathLinks].pos.y = tempnodes[j].pos.y;
-#else
- m_carPathLinks[m_numCarPathLinks].dirX = tempnodes[j].dirX;
- m_carPathLinks[m_numCarPathLinks].dirY = tempnodes[j].dirY;
- m_carPathLinks[m_numCarPathLinks].x = tempnodes[j].pos.x*8.0f;
- m_carPathLinks[m_numCarPathLinks].y = tempnodes[j].pos.y*8.0f;
- m_carPathLinks[m_numCarPathLinks].flag1 = false;
- m_carPathLinks[m_numCarPathLinks].width = tempnodes[j].width;
-#endif
m_carPathLinks[m_numCarPathLinks].pathNodeIndex = i;
m_carPathLinks[m_numCarPathLinks].numLeftLanes = tempnodes[j].numLeftLanes;
m_carPathLinks[m_numCarPathLinks].numRightLanes = tempnodes[j].numRightLanes;
@@ -1033,20 +707,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
m_numConnections++;
}
-#ifdef MIAMI
- CPathInfoForObject *tile;
- if(mapObjIndices[i] < 0){
- if(type == PATH_CAR)
- tile = &DetachedInfoForTileCars[12 * (-1 - mapObjIndices[i])];
- else
- tile = &DetachedInfoForTilePeds[12 * (-1 - mapObjIndices[i])];
- }else{
- if(type == PATH_CAR)
- tile = &InfoForTileCars[12 * m_mapObjects[mapObjIndices[i]]->GetModelIndex()];
- else
- tile = &InfoForTilePeds[12 * m_mapObjects[mapObjIndices[i]]->GetModelIndex()];
- }
-#endif
// Find i inside path segment
iseg = 0;
@@ -1054,9 +714,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
if(OBJECTINDEX(j) == OBJECTINDEX(i))
iseg++;
-#ifndef MIAMI
istart = 12 * m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex();
-#endif
// Add links to other internal nodes
for(j = Max(oldNumPathNodes, i-12); j < Min(m_numPathNodes, i+12); j++){
if(OBJECTINDEX(i) != OBJECTINDEX(j) || i == j)
@@ -1064,23 +722,14 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
// N.B.: in every path segment, the externals have to be at the end
jseg = j-i + iseg;
-#ifndef MIAMI
jstart = 12 * m_mapObjects[m_pathNodes[j].objectIndex]->GetModelIndex();
if(objectpathinfo[istart + iseg].next == jseg ||
objectpathinfo[jstart + jseg].next == iseg){
-#else
- if(tile[iseg].next == jseg ||
- tile[jseg].next == iseg){
-#endif
// Found a link between i and jConnectionSetCrossesRoad
// NB this clears the flags in MIAMI
m_connections[m_numConnections] = j;
dist = (m_pathNodes[i].GetPosition() - m_pathNodes[j].GetPosition()).Magnitude();
-#ifndef MIAMI
m_distances[m_numConnections] = dist;
-#else
- m_distances[m_numConnections] = Min(dist, 255);
-#endif
if(type == PATH_CAR){
posx = (m_pathNodes[i].GetX() + m_pathNodes[j].GetX())*0.5f;
@@ -1090,9 +739,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
mag = Sqrt(dx*dx + dy*dy);
dx /= mag;
dy /= mag;
-#ifdef MIAMI
- int width = Max(m_pathNodes[i].width, m_pathNodes[j].width);
-#endif
if(i < j){
dx = -dx;
dy = -dy;
@@ -1100,36 +746,20 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
// IMPROVE: use a goto here
// Find existing car path link
for(k = 0; k < m_numCarPathLinks; k++){
-#ifndef MIAMI
if(m_carPathLinks[k].dir.x == dx &&
m_carPathLinks[k].dir.y == dy &&
m_carPathLinks[k].pos.x == posx &&
m_carPathLinks[k].pos.y == posy){
-#else
- if(m_carPathLinks[k].dirX == (int)(dx*100.0f) &&
- m_carPathLinks[k].dirY == (int)(dy*100.0f) &&
- m_carPathLinks[k].x == (int)(posx*8.0f) &&
- m_carPathLinks[k].y == (int)(posy*8.0f)){
-#endif
m_carPathConnections[m_numConnections] = k;
k = m_numCarPathLinks;
}
}
// k is m_numCarPathLinks+1 if we found one
if(k == m_numCarPathLinks){
-#ifndef MIAMI
m_carPathLinks[m_numCarPathLinks].dir.x = dx;
m_carPathLinks[m_numCarPathLinks].dir.y = dy;
m_carPathLinks[m_numCarPathLinks].pos.x = posx;
m_carPathLinks[m_numCarPathLinks].pos.y = posy;
-#else
- m_carPathLinks[m_numCarPathLinks].dirX = dx*100.0f;
- m_carPathLinks[m_numCarPathLinks].dirY = dy*100.0f;
- m_carPathLinks[m_numCarPathLinks].x = posx*8.0f;
- m_carPathLinks[m_numCarPathLinks].y = posy*8.0f;
- m_carPathLinks[m_numCarPathLinks].flag1 = false;
- m_carPathLinks[m_numCarPathLinks].width = width;
-#endif
m_carPathLinks[m_numCarPathLinks].pathNodeIndex = i;
m_carPathLinks[m_numCarPathLinks].numLeftLanes = -1;
m_carPathLinks[m_numCarPathLinks].numRightLanes = -1;
@@ -1139,17 +769,11 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
}
}else{
// Crosses road
-#ifndef MIAMI
if(objectpathinfo[istart + iseg].next == jseg && objectpathinfo[istart + iseg].crossing ||
objectpathinfo[jstart + jseg].next == iseg && objectpathinfo[jstart + jseg].crossing)
m_connectionFlags[m_numConnections].bCrossesRoad = true;
else
m_connectionFlags[m_numConnections].bCrossesRoad = false;
-#else
- if(tile[iseg].next == jseg && tile[iseg].crossing ||
- tile[jseg].next == iseg && tile[jseg].crossing)
- m_connections[m_numConnections] |= 0x8000; // crosses road flag
-#endif
}
m_pathNodes[i].numLinks++;
@@ -1162,11 +786,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
done = 0;
// Set number of lanes for all nodes somehow
// very strange code
-#ifndef MIAMI
for(k = 0; !done && k < 10; k++){
-#else
- for(k = 0; !done && k < 12; k++){
-#endif
done = 1;
for(i = 0; i < m_numPathNodes; i++){
if(m_pathNodes[i].numLinks != 2)
@@ -1174,7 +794,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
l1 = m_carPathConnections[m_pathNodes[i].firstLink];
l2 = m_carPathConnections[m_pathNodes[i].firstLink+1];
-#ifndef MIAMI
if(m_carPathLinks[l1].numLeftLanes == -1 &&
m_carPathLinks[l2].numLeftLanes != -1){
done = 0;
@@ -1202,52 +821,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
}else if(m_carPathLinks[l1].numLeftLanes == -1 &&
m_carPathLinks[l2].numLeftLanes == -1)
done = 0;
-#else
- int8 l1Left = m_carPathLinks[l1].numLeftLanes;
- int8 l1Right = m_carPathLinks[l1].numRightLanes;
- int8 l2Left = m_carPathLinks[l2].numLeftLanes;
- int8 l2Right = m_carPathLinks[l2].numRightLanes;
- int8 *l1Leftp, *l1Rightp;
- int8 *l2Leftp, *l2Rightp;
- if(m_carPathLinks[l1].pathNodeIndex == i){
- l1Leftp = &l1Left;
- l1Rightp = &l1Right;
- }else{
- l1Leftp = &l1Right;
- l1Rightp = &l1Left;
- }
- if(m_carPathLinks[l2].pathNodeIndex == i){
- l2Leftp = &l2Left;
- l2Rightp = &l2Right;
- }else{
- l2Leftp = &l2Right;
- l2Rightp = &l2Left;
- }
- if(*l1Leftp == -1 && *l2Rightp != -1){
- *l1Leftp = *l2Rightp;
- done = 0;
- }
- if(*l1Rightp == -1 && *l2Leftp != -1){
- *l1Rightp = *l2Leftp;
- done = 0;
- }
- if(*l2Leftp == -1 && *l1Rightp != -1){
- *l2Leftp = *l1Rightp;
- done = 0;
- }
- if(*l2Rightp == -1 && *l1Leftp != -1){
- *l2Rightp = *l1Leftp;
- done = 0;
- }
- if(*l1Leftp == -1 && *l2Rightp == -1)
- done = 0;
- if(*l2Leftp == -1 && *l1Rightp == -1)
- done = 0;
- m_carPathLinks[l1].numLeftLanes = l1Left;
- m_carPathLinks[l1].numRightLanes = l1Right;
- m_carPathLinks[l2].numLeftLanes = l2Left;
- m_carPathLinks[l2].numRightLanes = l2Right;
-#endif
}
}
@@ -1255,17 +828,10 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
for(i = 0; i < m_numPathNodes; i++)
for(j = 0; j < m_pathNodes[i].numLinks; j++){
k = m_carPathConnections[m_pathNodes[i].firstLink + j];
-#ifndef MIAMI
if(m_carPathLinks[k].numLeftLanes < 0)
m_carPathLinks[k].numLeftLanes = 1;
if(m_carPathLinks[k].numRightLanes < 0)
m_carPathLinks[k].numRightLanes = 1;
-#else
- if(m_carPathLinks[k].numLeftLanes == -1)
- m_carPathLinks[k].numLeftLanes = 0;
- if(m_carPathLinks[k].numRightLanes == -1)
- m_carPathLinks[k].numRightLanes = 0;
-#endif
}
}
@@ -1274,10 +840,8 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
do{
cont = 0;
for(i = 0; i < m_numPathNodes; i++){
-#ifndef MIAMI
m_pathNodes[i].bDisabled = false;
m_pathNodes[i].bBetweenLevels = false;
-#endif
// See if node is a dead end, if so, we're not done yet
if(!m_pathNodes[i].bDeadEnd){
k = 0;
@@ -1310,7 +874,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
m_connections[j] = node-1;
}
-#ifndef MIAMI
// Also in treadables
for(j = 0; j < m_numMapObjects; j++)
for(k = 0; k < 12; k++){
@@ -1322,17 +885,12 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
}else if(m_mapObjects[j]->m_nodeIndices[PATH_PED][k] > i)
m_mapObjects[j]->m_nodeIndices[PATH_PED][k]--;
}
-#endif
i--;
m_numPathNodes--;
}
-#ifdef MIAMI
- delete[] mapObjIndices;
-#endif
}
-//--MIAMI: done
float
CPathFind::CalcRoadDensity(float x, float y)
{
@@ -1350,7 +908,6 @@ CPathFind::CalcRoadDensity(float x, float y)
density += m_carPathLinks[next].numLeftLanes * dist;
density += m_carPathLinks[next].numRightLanes * dist;
-#ifndef MIAMI
if(m_carPathLinks[next].numLeftLanes < 0)
printf("Link from object %d to %d (MIs)\n",
m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex(),
@@ -1359,14 +916,12 @@ CPathFind::CalcRoadDensity(float x, float y)
printf("Link from object %d to %d (MIs)\n",
m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex(),
m_mapObjects[m_pathNodes[ConnectedNode(m_pathNodes[i].firstLink + j)].objectIndex]->GetModelIndex());
-#endif
}
}
}
return density/2500.0f;
}
-//--MIAMI: done
bool
CPathFind::TestForPedTrafficLight(CPathNode *n1, CPathNode *n2)
{
@@ -1377,7 +932,6 @@ CPathFind::TestForPedTrafficLight(CPathNode *n1, CPathNode *n2)
return false;
}
-//--MIAMI: done
bool
CPathFind::TestCrossesRoad(CPathNode *n1, CPathNode *n2)
{
@@ -1388,7 +942,6 @@ CPathFind::TestCrossesRoad(CPathNode *n1, CPathNode *n2)
return false;
}
-//--MIAMI: done
void
CPathFind::AddNodeToList(CPathNode *node, int32 listId)
{
@@ -1401,7 +954,6 @@ CPathFind::AddNodeToList(CPathNode *node, int32 listId)
node->distance = listId;
}
-//--MIAMI: done
void
CPathFind::RemoveNodeFromList(CPathNode *node)
{
@@ -1410,7 +962,6 @@ CPathFind::RemoveNodeFromList(CPathNode *node)
node->GetNext()->SetPrev(node->GetPrev());
}
-//--MIAMI: done
void
CPathFind::RemoveBadStartNode(CVector pos, CPathNode **nodes, int16 *n)
{
@@ -1438,7 +989,6 @@ CPathFind::SetLinksBridgeLights(float x1, float x2, float y1, float y2, bool ena
}
#endif
-//--MIAMI: done
void
CPathFind::SwitchOffNodeAndNeighbours(int32 nodeId, bool disable)
{
@@ -1454,7 +1004,6 @@ CPathFind::SwitchOffNodeAndNeighbours(int32 nodeId, bool disable)
}
}
-//--MIAMI: done
void
CPathFind::SwitchRoadsOffInArea(float x1, float x2, float y1, float y2, float z1, float z2, bool disable)
{
@@ -1470,7 +1019,6 @@ CPathFind::SwitchRoadsOffInArea(float x1, float x2, float y1, float y2, float z1
}
}
-//--MIAMI: done
void
CPathFind::SwitchPedRoadsOffInArea(float x1, float x2, float y1, float y2, float z1, float z2, bool disable)
{
@@ -1486,7 +1034,6 @@ CPathFind::SwitchPedRoadsOffInArea(float x1, float x2, float y1, float y2, float
}
}
-//--MIAMI: unused (still needed for script here)
void
CPathFind::SwitchRoadsInAngledArea(float x1, float y1, float z1, float x2, float y2, float z2, float length, uint8 type, uint8 mode)
{
@@ -1538,7 +1085,6 @@ CPathFind::SwitchRoadsInAngledArea(float x1, float y1, float z1, float x2, float
}
}
-//--MIAMI: unused (still needed for script here)
void
CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId)
{
@@ -1554,7 +1100,6 @@ CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId)
}
}
-//--MIAMI: unused (still needed for script here)
void
CPathFind::MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
{
@@ -1569,7 +1114,6 @@ CPathFind::MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2,
}
}
-//--MIAMI: unused (still needed for script here)
void
CPathFind::PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
{
@@ -1584,14 +1128,8 @@ CPathFind::PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y
}
}
-//--MIAMI: done
-#ifndef MIAMI
int32
CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled, bool ignoreBetweenLevels)
-#else
-int32
-CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled, bool ignoreBetweenLevels, bool ignoreFlagB4, bool bWaterPath)
-#endif
{
int i;
int firstNode, lastNode;
@@ -1613,14 +1151,9 @@ CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bo
for(i = firstNode; i < lastNode; i++){
if(ignoreDisabled && m_pathNodes[i].bDisabled) continue;
if(ignoreBetweenLevels && m_pathNodes[i].bBetweenLevels) continue;
-#ifndef MIAMI
switch(m_pathNodes[i].unkBits){
case 1:
case 2:
-#else
- if(ignoreFlagB4 && m_pathNodes[i].flagB4) continue;
- if(bWaterPath != m_pathNodes[i].bWaterPath) continue;
-#endif
dist = Abs(m_pathNodes[i].GetX() - coors.x) +
Abs(m_pathNodes[i].GetY() - coors.y) +
3.0f*Abs(m_pathNodes[i].GetZ() - coors.z);
@@ -1628,15 +1161,12 @@ CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bo
closestDist = dist;
closestNode = i;
}
-#ifndef MIAMI
break;
}
-#endif
}
return closestDist < distLimit ? closestNode : -1;
}
-//--MIAMI: done
int32
CPathFind::FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, float dirX, float dirY)
{
@@ -1659,11 +1189,9 @@ CPathFind::FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, floa
}
for(i = firstNode; i < lastNode; i++){
-#ifndef MIAMI
switch(m_pathNodes[i].unkBits){
case 1:
case 2:
-#endif
dX = m_pathNodes[i].GetX() - coors.x;
dY = m_pathNodes[i].GetY() - coors.y;
dist = Abs(dX) + Abs(dY) +
@@ -1676,15 +1204,12 @@ CPathFind::FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, floa
closestNode = i;
}
}
-#ifndef MIAMI
break;
}
-#endif
}
return closestNode;
}
-//--MIAMI: done
float
CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
{
@@ -1696,7 +1221,6 @@ CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
return RADTODEG(dir.Heading());
}
-//--MIAMI: unused (still needed for script here)
float
CPathFind::FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, float x, float y, bool towards)
{
@@ -1740,8 +1264,6 @@ CPathFind::FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, flo
return RADTODEG(dir.Heading());
}
-// no "New" in MIAMI
-//--MIAMI: TODO
bool
CPathFind::NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY, float spawnDist, float angleLimit, bool forward, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, bool ignoreDisabled)
{
@@ -1796,7 +1318,6 @@ CPathFind::NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY,
return false;
}
-//--MIAMI: TODO
bool
CPathFind::GeneratePedCreationCoors(float x, float y, float minDist, float maxDist, float minDistOffScreen, float maxDistOffScreen, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, CMatrix *camMatrix)
{
@@ -1856,7 +1377,6 @@ CPathFind::GeneratePedCreationCoors(float x, float y, float minDist, float maxDi
return false;
}
-#ifndef MIAMI
CTreadable*
CPathFind::FindRoadObjectClosestToCoors(CVector coors, uint8 type)
{
@@ -1892,9 +1412,7 @@ CPathFind::FindRoadObjectClosestToCoors(CVector coors, uint8 type)
}
return closestMapObj;
}
-#endif
-//--MIAMI: done
void
CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode, CPathNode **nextNode, uint8 curDir, uint8 *nextDir)
{
@@ -1902,7 +1420,6 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
CPathNode *node;
if(lastNode == nil || (node = *lastNode) == nil || (coors - (*lastNode)->GetPosition()).MagnitudeSqr() > 7.0f){
-#ifndef MIAMI
// need to find the node we're coming from
node = nil;
CTreadable *obj = FindRoadObjectClosestToCoors(coors, type);
@@ -1916,10 +1433,6 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
node = &m_pathNodes[obj->m_nodeIndices[type][i]];
}
}
-#else
- int32 nodeIdx = FindNodeClosestToCoors(coors, type, 999999.88f);
- node = &m_pathNodes[nodeIdx];
-#endif
}
CVector2D vCurDir(Sin(curDir*PI/4.0f), Cos(curDir * PI / 4.0f));
@@ -1975,13 +1488,8 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
}
}
-#ifndef MIAMI
static CPathNode *apNodesToBeCleared[4995];
-#else
-static CPathNode *apNodesToBeCleared[6525];
-#endif
-//--MIAMI: done
void
CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target, CPathNode **nodes, int16 *pNumNodes, int16 maxNumNodes, CVehicle *vehicle, float *pDist, float distLimit, int32 targetNodeId)
{
@@ -1997,7 +1505,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
}
// Find start
-#ifndef MIAMI
int numPathsToTry;
CTreadable *startObj;
if(startNodeId < 0){
@@ -2035,25 +1542,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
return;
}
}
-#else
- if(startNodeId < 0)
- startNodeId = FindNodeClosestToCoors(start, type, 999999.88f);
- if(startNodeId < 0) {
- *pNumNodes = 0;
- if(pDist) *pDist = 100000.0f;
- return;
- }
- if(startNodeId == targetNodeId){
- *pNumNodes = 0;
- if(pDist) *pDist = 0.0f;
- return;
- }
- if(m_pathNodes[startNodeId].group != m_pathNodes[targetNodeId].group) {
- *pNumNodes = 0;
- if(pDist) *pDist = 100000.0f;
- return;
- }
-#endif
for(i = 0; i < ARRAY_SIZE(m_searchNodes); i++)
m_searchNodes[i].SetNext(nil);
@@ -2064,23 +1552,14 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
// Dijkstra's algorithm
// Find distances
int numPathsFound = 0;
-#ifndef MIAMI
if(startNodeId < 0 && m_mapObjects[m_pathNodes[targetNodeId].objectIndex] == startObj)
numPathsFound++;
for(i = 0; numPathsFound < numPathsToTry; i = (i+1) & 0x1FF){
-#else
- for(i = 0; numPathsFound == 0; i = (i+1) & 0x1FF){
-#endif
CPathNode *node;
for(node = m_searchNodes[i].GetNext(); node; node = node->GetNext()){
-#ifndef MIAMI
if(m_mapObjects[node->objectIndex] == startObj &&
(startNodeId < 0 || node == &m_pathNodes[startNodeId]))
numPathsFound++;
-#else
- if(node == &m_pathNodes[startNodeId])
- numPathsFound = 1;
-#endif
for(j = 0; j < node->numLinks; j++){
int next = ConnectedNode(node->firstLink + j);
@@ -2100,7 +1579,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
// Find out whence to start tracing back
CPathNode *curNode;
-#ifndef MIAMI
if(startNodeId < 0){
int minDist = MAX_DIST;
*pNumNodes = 1;
@@ -2122,7 +1600,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
if(pDist)
*pDist = minDist;
}else
-#endif
{
curNode = &m_pathNodes[startNodeId];
*pNumNodes = 0;
@@ -2130,9 +1607,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
*pDist = m_pathNodes[startNodeId].distance;
}
-#ifdef MIAMI
- nodes[(*pNumNodes)++] = curNode;
-#endif
// Trace back to target and update list of nodes
while(*pNumNodes < maxNumNodes && curNode != &m_pathNodes[targetNodeId])
for(i = 0; i < curNode->numLinks; i++){
@@ -2153,7 +1627,6 @@ static CPathNode *pNodeList[32];
static int16 DummyResult;
static int16 DummyResult2;
-//--MIAMI: done
bool
CPathFind::TestCoorsCloseness(CVector target, uint8 type, CVector start)
{
@@ -2164,16 +1637,11 @@ CPathFind::TestCoorsCloseness(CVector target, uint8 type, CVector start)
else
DoPathSearch(type, start, -1, target, nil, &DummyResult2, 0, nil, &dist, 50.0f, -1);
if(type == PATH_CAR)
-#ifndef MIAMI
return dist < 160.0f;
-#else
- return dist < 150.0f;
-#endif
else
return dist < 100.0f;
}
-//--MIAMI: done
void
CPathFind::Save(uint8 *buf, uint32 *size)
{
@@ -2195,7 +1663,6 @@ CPathFind::Save(uint8 *buf, uint32 *size)
buf[i/8 + n] &= ~(1 << i%8);
}
-//--MIAMI: done
void
CPathFind::Load(uint8 *buf, uint32 size)
{
@@ -2340,25 +1807,3 @@ CPathFind::DisplayPathData(void)
}
}
}
-
-#ifdef MIAMI
-CPathNode*
-CPathFind::GetNode(int16 index)
-{
- if(index < 0)
- return nil;
- if(index < ARRAY_SIZE(ThePaths.m_searchNodes))
- return &ThePaths.m_searchNodes[index];
- return &ThePaths.m_pathNodes[index - ARRAY_SIZE(ThePaths.m_searchNodes)];
-}
-int16
-CPathFind::GetIndex(CPathNode *node)
-{
- if(node == nil)
- return -1;
- if(node >= &ThePaths.m_searchNodes[0] && node < &ThePaths.m_searchNodes[ARRAY_SIZE(ThePaths.m_searchNodes)])
- return node - ThePaths.m_searchNodes;
- else
- return (node - ThePaths.m_pathNodes) + ARRAY_SIZE(ThePaths.m_searchNodes);
-}
-#endif
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index d2799f87..8049ea52 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -55,7 +55,6 @@ public:
struct CPathNode
{
-#ifndef MIAMI
CVector pos;
CPathNode *prev;
CPathNode *next;
@@ -81,44 +80,6 @@ struct CPathNode
CPathNode *GetNext(void) { return next; }
void SetPrev(CPathNode *node) { prev = node; }
void SetNext(CPathNode *node) { next = node; }
-#else
- int16 prevIndex;
- int16 nextIndex;
- int16 x;
- int16 y;
- int16 z;
- int16 distance; // in path search
- int16 firstLink;
- int8 width;
- int8 group;
-
- uint8 numLinks : 4;
- uint8 bDeadEnd : 1;
- uint8 bDisabled : 1;
- uint8 bBetweenLevels : 1;
- uint8 bUseInRoadBlock : 1;
-
- uint8 bWaterPath : 1;
- uint8 flagB2 : 1; // flag 2 in node info, always zero
- uint8 flagB4 : 1; // where is this set?
- uint8 speedLimit : 2;
- //uint8 flagB20 : 1;
- //uint8 flagB40 : 1;
- //uint8 flagB80 : 1;
-
- uint8 spawnRate : 4;
- uint8 flagsC : 4;
-
- CVector GetPosition(void) { return CVector(x/8.0f, y/8.0f, z/8.0f); }
- void SetPosition(const CVector &p) { x = p.x*8.0f; y = p.y*8.0f; z = p.z*8.0f; }
- float GetX(void) { return x/8.0f; }
- float GetY(void) { return y/8.0f; }
- float GetZ(void) { return z/8.0f; }
- CPathNode *GetPrev(void);
- CPathNode *GetNext(void);
- void SetPrev(CPathNode *node);
- void SetNext(CPathNode *node);
-#endif
};
union CConnectionFlags
@@ -132,7 +93,6 @@ union CConnectionFlags
struct CCarPathLink
{
-#ifndef MIAMI
CVector2D pos;
CVector2D dir;
int16 pathNodeIndex;
@@ -149,26 +109,6 @@ struct CCarPathLink
float GetY(void) { return pos.y; }
float GetDirX(void) { return dir.x; }
float GetDirY(void) { return dir.y; }
-#else
- int16 x;
- int16 y;
- int16 pathNodeIndex;
- int8 dirX;
- int8 dirY;
- int8 numLeftLanes : 3;
- int8 numRightLanes : 3;
- uint8 flag1 : 1;
- uint8 trafficLightType : 2;
- uint8 bBridgeLights : 1; // at least in LCS...
- int8 width;
-
- CVector2D GetPosition(void) { return CVector2D(x/8.0f, y/8.0f); }
- CVector2D GetDirection(void) { return CVector2D(dirX/100.0f, dirY/100.0f); }
- float GetX(void) { return x/8.0f; }
- float GetY(void) { return y/8.0f; }
- float GetDirX(void) { return dirX/100.0f; }
- float GetDirY(void) { return dirY/100.0f; }
-#endif
float OneWayLaneOffset()
{
@@ -183,7 +123,6 @@ struct CCarPathLink
// This is what we're reading from the files, only temporary
struct CPathInfoForObject
{
-#ifndef MIAMI
int16 x;
int16 y;
int16 z;
@@ -192,28 +131,6 @@ struct CPathInfoForObject
int8 numLeftLanes;
int8 numRightLanes;
uint8 crossing : 1;
-#else
- float x;
- float y;
- float z;
- int8 type;
- int8 next;
- int8 numLeftLanes;
- int8 numRightLanes;
- int8 speedLimit;
- int8 width;
-
- uint8 crossing : 1;
- uint8 flag02 : 1; // always zero
- uint8 roadBlock : 1;
- uint8 disabled : 1;
- uint8 waterPath : 1;
- uint8 betweenLevels : 1;
-
- uint8 spawnRate : 4;
-
- void SwapConnectionsToBeRightWayRound(void);
-#endif
};
extern CPathInfoForObject *InfoForTileCars;
extern CPathInfoForObject *InfoForTilePeds;
@@ -221,7 +138,6 @@ extern CPathInfoForObject *InfoForTilePeds;
struct CTempNode
{
CVector pos;
-#ifndef MIAMI
float dirX;
float dirY;
int16 link1;
@@ -229,37 +145,12 @@ struct CTempNode
int8 numLeftLanes;
int8 numRightLanes;
int8 linkState;
-#else
- int8 dirX; // *100
- int8 dirY;
- int16 link1;
- int16 link2;
- int8 numLeftLanes;
- int8 numRightLanes;
- int8 width;
- bool isCross;
- int8 linkState;
-#endif
};
-#ifdef MIAMI
-struct CTempNodeExternal // made up name
-{
- CVector pos;
- int16 next;
- int8 numLeftLanes;
- int8 numRightLanes;
- int8 width;
- bool isCross;
-};
-#endif
-
-#ifndef MIAMI
struct CTempDetachedNode // unused
{
uint8 foo[20];
};
-#endif
class CPathFind
{
@@ -267,15 +158,10 @@ public:
CPathNode m_pathNodes[NUM_PATHNODES];
CCarPathLink m_carPathLinks[NUM_CARPATHLINKS];
CTreadable *m_mapObjects[NUM_MAPOBJECTS];
-#ifndef MIAMI
uint8 m_objectFlags[NUM_MAPOBJECTS];
int16 m_connections[NUM_PATHCONNECTIONS];
int16 m_distances[NUM_PATHCONNECTIONS];
CConnectionFlags m_connectionFlags[NUM_PATHCONNECTIONS];
-#else
- uint16 m_connections[NUM_PATHCONNECTIONS]; // and flags
- uint8 m_distances[NUM_PATHCONNECTIONS];
-#endif
int16 m_carPathConnections[NUM_PATHCONNECTIONS];
int32 m_numPathNodes;
@@ -293,20 +179,12 @@ public:
void RegisterMapObject(CTreadable *mapObject);
void StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, bool crossing);
void StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, int8 numLeft, int8 numRight);
-#ifndef MIAMI
void CalcNodeCoors(int16 x, int16 y, int16 z, int32 id, CVector *out);
-#else
- void CalcNodeCoors(float x, float y, float z, int32 id, CVector *out);
-#endif
bool LoadPathFindData(void);
void PreparePathData(void);
void CountFloodFillGroups(uint8 type);
void PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoForObject *objectpathinfo,
-#ifndef MIAMI
float maxdist, CTempDetachedNode *detachednodes, int32 numDetached);
-#else
- float maxdist, CPathInfoForObject *detachednodes, int32 numDetached);
-#endif
bool IsPathObject(int id) { return id < PATHNODESIZE && (InfoForTileCars[id*12].type != 0 || InfoForTilePeds[id*12].type != 0); }
@@ -324,56 +202,29 @@ public:
void MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId);
void MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
void PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
-#ifndef MIAMI
int32 FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled = false, bool ignoreBetweenLevels = false);
-#else
-//--MIAMI: TODO: check callers for new arguments
- int32 FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled = false, bool ignoreBetweenLevels = false, bool ignoreFlagB4 = false, bool bWaterPath = false);
-#endif
int32 FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, float dirX, float dirY);
float FindNodeOrientationForCarPlacement(int32 nodeId);
float FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, float x, float y, bool towards);
bool NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY, float spawnDist, float angleLimit, bool forward, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, bool ignoreDisabled = false);
bool GeneratePedCreationCoors(float x, float y, float minDist, float maxDist, float minDistOffScreen, float maxDistOffScreen, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, CMatrix *camMatrix);
-#ifndef MIAMI
CTreadable *FindRoadObjectClosestToCoors(CVector coors, uint8 type);
-#endif
void FindNextNodeWandering(uint8, CVector, CPathNode**, CPathNode**, uint8, uint8*);
void DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target, CPathNode **nodes, int16 *numNodes, int16 maxNumNodes, CVehicle *vehicle, float *dist, float distLimit, int32 forcedTargetNode);
bool TestCoorsCloseness(CVector target, uint8 type, CVector start);
void Save(uint8 *buf, uint32 *size);
void Load(uint8 *buf, uint32 size);
-
-#ifdef MIAMI
- CPathNode *GetNode(int16 index);
- int16 GetIndex(CPathNode *node);
-
- uint16 ConnectedNode(int id) { return m_connections[id] & 0x3FFF; }
- bool ConnectionCrossesRoad(int id) { return !!(m_connections[id] & 0x8000); }
- bool ConnectionHasTrafficLight(int id) { return !!(m_connections[id] & 0x4000); }
- void ConnectionSetTrafficLight(int id) { m_connections[id] |= 0x4000; }
-#else
uint16 ConnectedNode(int id) { return m_connections[id]; }
bool ConnectionCrossesRoad(int id) { return m_connectionFlags[id].bCrossesRoad; }
bool ConnectionHasTrafficLight(int id) { return m_connectionFlags[id].bTrafficLight; }
void ConnectionSetTrafficLight(int id) { m_connectionFlags[id].bTrafficLight = true; }
-#endif
void DisplayPathData(void);
};
-#ifndef MIAMI
static_assert(sizeof(CPathFind) == 0x49bf4, "CPathFind: error");
-#endif
extern CPathFind ThePaths;
-#ifdef MIAMI
-inline CPathNode *CPathNode::GetPrev(void) { return ThePaths.GetNode(prevIndex); }
-inline CPathNode *CPathNode::GetNext(void) { return ThePaths.GetNode(nextIndex); }
-inline void CPathNode::SetPrev(CPathNode *node) { prevIndex = ThePaths.GetIndex(node); }
-inline void CPathNode::SetNext(CPathNode *node) { nextIndex = ThePaths.GetIndex(node); }
-#endif
-
extern bool gbShowPedPaths;
extern bool gbShowCarPaths;
extern bool gbShowCarPathsLinks;
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index 6ae99e2c..d086543f 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -417,10 +417,8 @@ void CRecordDataForChase::GiveUsACar(int32 mi, CVector pos, float angle, CAutomo
*ppCar = pCar;
}
-//--MIAMI: unused
void RemoveUnusedCollision(void)
{
-#ifndef MIAMI
static const char* dontDeleteArray[] = {
"rd_SrRoad2A50", "rd_SrRoad2A20", "rd_CrossRda1w22", "rd_CrossRda1rw22",
"road_broadway02", "road_broadway01", "com_21way5", "com_21way50",
@@ -432,7 +430,6 @@ void RemoveUnusedCollision(void)
CModelInfo::RemoveColModelsFromOtherLevels(LEVEL_NONE);
for (int i = 0; i < ARRAY_SIZE(dontDeleteArray); i++)
CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_COMMERCIAL;
-#endif
}
void CRecordDataForChase::StartChaseScene(float startTime)
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index 322cc1df..1c0d9f96 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -15,40 +15,22 @@
#include "CarCtrl.h"
#include "General.h"
-#ifndef MIAMI
#define ROADBLOCKDIST (80.0f)
-#else
-#define ROADBLOCKDIST (90.0f)
-#endif
int16 CRoadBlocks::NumRoadBlocks;
-#ifndef MIAMI
int16 CRoadBlocks::RoadBlockObjects[NUMROADBLOCKS];
-#else
-int16 CRoadBlocks::RoadBlockNodes[NUMROADBLOCKS];
-#endif
bool CRoadBlocks::InOrOut[NUMROADBLOCKS];
-//--MIAMI: TODO: script roadblocks
void
CRoadBlocks::Init(void)
{
int i;
NumRoadBlocks = 0;
-#ifndef MIAMI
for (i = 0; i < ThePaths.m_numMapObjects; i++) {
if (ThePaths.m_objectFlags[i] & UseInRoadBlock) {
-#else
- for(i = 0; i < ThePaths.m_numCarPathNodes; i++){
- if(ThePaths.m_pathNodes[i].bUseInRoadBlock && ThePaths.m_pathNodes[i].numLinks == 2){
-#endif
if (NumRoadBlocks < NUMROADBLOCKS) {
InOrOut[NumRoadBlocks] = true;
-#ifndef MIAMI
RoadBlockObjects[NumRoadBlocks] = i;
-#else
- RoadBlockNodes[NumRoadBlocks] = i;
-#endif
NumRoadBlocks++;
} else {
#ifndef MASTER
@@ -128,19 +110,14 @@ CRoadBlocks::GenerateRoadBlocks(void)
int16 nRoadblockNode = (int16)(NUMROADBLOCKS * frame) / 16;
const int16 maxRoadBlocks = (int16)(NUMROADBLOCKS * (frame + 1)) / 16;
for (; nRoadblockNode < Min(NumRoadBlocks, maxRoadBlocks); nRoadblockNode++) {
-#ifndef MIAMI
CTreadable *mapObject = ThePaths.m_mapObjects[RoadBlockObjects[nRoadblockNode]];
CVector2D vecDistance = FindPlayerCoors() - mapObject->GetPosition();
-#else
- CVector2D vecDistance = FindPlayerCoors() - ThePaths.m_pathNodes[nRoadblockNode].GetPosition();
-#endif
if (vecDistance.x > -ROADBLOCKDIST && vecDistance.x < ROADBLOCKDIST &&
vecDistance.y > -ROADBLOCKDIST && vecDistance.y < ROADBLOCKDIST &&
vecDistance.Magnitude() < ROADBLOCKDIST) {
if (!InOrOut[nRoadblockNode]) {
InOrOut[nRoadblockNode] = true;
if (FindPlayerVehicle() && (CGeneral::GetRandomNumber() & 0x7F) < FindPlayerPed()->m_pWanted->m_RoadblockDensity) {
-#ifndef MIAMI
CWanted *pPlayerWanted = FindPlayerPed()->m_pWanted;
float fMapObjectRadius = 2.0f * mapObject->GetColModel()->boundingBox.max.x;
int32 vehicleId = MI_POLICE;
@@ -210,13 +187,10 @@ CRoadBlocks::GenerateRoadBlocks(void)
}
}
}
-#endif
}
}
} else {
InOrOut[nRoadblockNode] = false;
}
}
-
-//--MIAMI: TODO script roadblocks
}
diff --git a/src/control/RoadBlocks.h b/src/control/RoadBlocks.h
index 439fd6e7..0f0c1882 100644
--- a/src/control/RoadBlocks.h
+++ b/src/control/RoadBlocks.h
@@ -7,11 +7,7 @@ class CRoadBlocks
{
public:
static int16 NumRoadBlocks;
-#ifndef MIAMI
static int16 RoadBlockObjects[NUMROADBLOCKS];
-#else
- static int16 RoadBlockNodes[NUMROADBLOCKS];
-#endif
static bool InOrOut[NUMROADBLOCKS];
static void Init(void);
diff --git a/src/control/Script.h b/src/control/Script.h
index 12a507c1..01cad269 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -372,9 +372,6 @@ private:
friend class CRunningScript;
friend class CHud;
friend void CMissionCleanup::Process();
-#ifdef MIAMI
- friend class CColStore;
-#endif
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:16:44 +0100