1 files changed, 182 insertions, 81 deletions

diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index c22bebaa..46eee71f 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -14,23 +14,30 @@
 #include "Camera.h"
 #include "CarCtrl.h"
 #include "General.h"
+#include "Object.h"
 
-#define ROADBLOCKDIST (80.0f)
+#define ROADBLOCKDIST (90.0f)
+#define ROADBLOCK_OBJECT_WIDTH (4.0f)
 
 int16 CRoadBlocks::NumRoadBlocks;
-int16 CRoadBlocks::RoadBlockObjects[NUMROADBLOCKS];
+int16 CRoadBlocks::RoadBlockNodes[NUMROADBLOCKS];
 bool CRoadBlocks::InOrOut[NUMROADBLOCKS];
+CScriptRoadblock CRoadBlocks::aScriptRoadBlocks[NUM_SCRIPT_ROADBLOCKS];
+
+#ifdef SECUROM
+uint8 roadBlocksPirateCheck = 0;
+#endif
 
 void
 CRoadBlocks::Init(void)
 {
 	int i;
 	NumRoadBlocks = 0;
-	for (i = 0; i < ThePaths.m_numMapObjects; i++) {
-		if (ThePaths.m_objectFlags[i] & UseInRoadBlock) {
+	for(i = 0; i < ThePaths.m_numCarPathNodes; i++){
+		if(ThePaths.m_pathNodes[i].bUseInRoadBlock && ThePaths.m_pathNodes[i].numLinks == 2){
 			if (NumRoadBlocks < NUMROADBLOCKS) {
 				InOrOut[NumRoadBlocks] = true;
-				RoadBlockObjects[NumRoadBlocks] = i;
+				RoadBlockNodes[NumRoadBlocks] = i;
 				NumRoadBlocks++;
 			} else {
 #ifndef MASTER
@@ -41,10 +48,12 @@ CRoadBlocks::Init(void)
 			}
 		}
 	}
+
+	ClearScriptRoadBlocks();
 }
 
 void
-CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType, int16 roadBlockNode)
+CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType)
 {
 	static const CVector vecRoadBlockOffets[6] = { CVector(-1.5, 1.8f, 0.0f), CVector(-1.5f, -1.8f, 0.0f), CVector(1.5f, 1.8f, 0.0f),
 	CVector(1.5f, -1.8f, 0.0f), CVector(-1.5f, 0.0f, 0.0f), CVector(1.5, 0.0, 0.0) };
@@ -60,7 +69,7 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
 		eCopType copType = COP_STREET;
 		switch (pVehicle->GetModelIndex())
 		{
-		case MI_FBICAR:
+		case MI_FBIRANCH:
 			modelInfoId = MI_FBI;
 			copType = COP_FBI;
 			break;
@@ -85,8 +94,10 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
 		pCopPed->SetIdle();
 		pCopPed->bKindaStayInSamePlace = true;
 		pCopPed->bNotAllowedToDuck = false;
-		pCopPed->m_nRoadblockNode = roadBlockNode;
-		pCopPed->bCrouchWhenShooting = roadBlockType != 2;
+		pCopPed->m_nExtendedRangeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+		pCopPed->m_nRoadblockVeh = pVehicle;
+		pCopPed->m_nRoadblockVeh->RegisterReference((CEntity**)&pCopPed->m_nRoadblockVeh);
+		pCopPed->bCrouchWhenShooting = roadBlockType == 2 ? false : true;
 		if (pEntityToAttack) {
 			pCopPed->SetWeaponLockOnTarget(pEntityToAttack);
 			pCopPed->SetAttack(pEntityToAttack);
@@ -102,96 +113,186 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
 void 
 CRoadBlocks::GenerateRoadBlocks(void) 
 { 
+	CMatrix tmp1, tmp2;
+	static int16 unk;
 #ifdef SQUEEZE_PERFORMANCE
 	if (FindPlayerPed()->m_pWanted->m_RoadblockDensity == 0)
 		return;
 #endif
-	CMatrix offsetMatrix;
 	uint32 frame = CTimer::GetFrameCounter() & 0xF;
 	int16 nRoadblockNode = (int16)(NUMROADBLOCKS * frame) / 16;
 	const int16 maxRoadBlocks = (int16)(NUMROADBLOCKS * (frame + 1)) / 16;
 	for (; nRoadblockNode < Min(NumRoadBlocks, maxRoadBlocks); nRoadblockNode++) {
-		CTreadable *mapObject = ThePaths.m_mapObjects[RoadBlockObjects[nRoadblockNode]];
-		CVector2D vecDistance = FindPlayerCoors() - mapObject->GetPosition();
+		int16 node = RoadBlockNodes[nRoadblockNode];
+		CVector2D vecDistance = FindPlayerCoors() - ThePaths.m_pathNodes[node].GetPosition();
 		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) {
-					CWanted *pPlayerWanted = FindPlayerPed()->m_pWanted;
-					float fMapObjectRadius = 2.0f * mapObject->GetColModel()->boundingBox.max.x;
-					int32 vehicleId = MI_POLICE;
-					if (pPlayerWanted->AreArmyRequired())
-						vehicleId = MI_BARRACKS;
-					else if (pPlayerWanted->AreFbiRequired())
-						vehicleId = MI_FBICAR;
-					else if (pPlayerWanted->AreSwatRequired())
-						vehicleId = MI_ENFORCER;
-					if (!CStreaming::HasModelLoaded(vehicleId))
-						vehicleId = MI_POLICE;
-					CColModel *pVehicleColModel = CModelInfo::GetModelInfo(vehicleId)->GetColModel();
-					float fModelRadius = 2.0f * pVehicleColModel->boundingSphere.radius + 0.25f;
-					int16 radius = (int16)(fMapObjectRadius / fModelRadius);
-					if (radius >= 6)
-						continue;
-					CVector2D vecDistanceToCamera = TheCamera.GetPosition() - mapObject->GetPosition();
-					float fDotProduct = DotProduct2D(vecDistanceToCamera, mapObject->GetForward());
-					float fOffset = 0.5f * fModelRadius * (float)(radius - 1);
-					for (int16 i = 0; i < radius; i++) {
-						uint8 nRoadblockType = fDotProduct < 0.0f;
-						if (CGeneral::GetRandomNumber() & 1) {
-							offsetMatrix.SetRotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f + HALFPI);
-						}
-						else {
-							nRoadblockType = !nRoadblockType;
-							offsetMatrix.SetRotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f - HALFPI);
-						}
-						if (ThePaths.m_objectFlags[RoadBlockObjects[nRoadblockNode]] & ObjectEastWest)
-							offsetMatrix.GetPosition() = CVector(0.0f, i * fModelRadius - fOffset, 0.6f);
-						else
-							offsetMatrix.GetPosition() = CVector(i * fModelRadius - fOffset, 0.0f, 0.6f);
-						CMatrix vehicleMatrix = mapObject->GetMatrix() * offsetMatrix;
-						float fModelRadius = CModelInfo::GetModelInfo(vehicleId)->GetColModel()->boundingSphere.radius - 0.25f;
-						int16 colliding = 0;
-						CWorld::FindObjectsKindaColliding(vehicleMatrix.GetPosition(), fModelRadius, 0, &colliding, 2, nil, false, true, true, false, false);
-						if (!colliding) {
-							CAutomobile *pVehicle = new CAutomobile(vehicleId, RANDOM_VEHICLE);
-							pVehicle->SetStatus(STATUS_ABANDONED);
-							// pVehicle->GetHeightAboveRoad(); // called but return value is ignored?
-							vehicleMatrix.GetPosition().z += fModelRadius - 0.6f;
-							pVehicle->SetMatrix(vehicleMatrix);
-							pVehicle->PlaceOnRoadProperly();
-							pVehicle->SetIsStatic(false);
-							pVehicle->GetMatrix().UpdateRW();
-							pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-							CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-							pVehicle->bIsLocked = false;
-							pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-							pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
-							pVehicle->AutoPilot.m_nCurrentLane = 0;
-							pVehicle->AutoPilot.m_nNextLane = 0;
-							pVehicle->AutoPilot.m_fMaxTrafficSpeed = 0.0f;
-							pVehicle->AutoPilot.m_nCruiseSpeed = 0.0f;
-							pVehicle->bExtendedRange = true;
-							if (pVehicle->UsesSiren(pVehicle->GetModelIndex()) && CGeneral::GetRandomNumber() & 1)
-								pVehicle->m_bSirenOrAlarm = true;
-							if (pVehicle->GetUp().z > 0.94f) {
-								CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
-								CWorld::Add(pVehicle);
-								pVehicle->bCreateRoadBlockPeds = true;
-								pVehicle->m_nRoadblockType = nRoadblockType;
-								pVehicle->m_nRoadblockNode = nRoadblockNode;
-							}
-							else {
-								delete pVehicle;
-							}
-						}
+					CCarPathLink* pLink1 = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[ThePaths.m_pathNodes[node].firstLink]];
+					CCarPathLink* pLink2 = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[ThePaths.m_pathNodes[node].firstLink + 1]];
+					int lanes = Min(pLink1->numRightLanes + pLink1->numLeftLanes, pLink2->numLeftLanes + pLink2->numRightLanes);
+					float length = LANE_WIDTH * (lanes + 1);
+					CVector forward(pLink2->GetY() - pLink1->GetY(), -(pLink2->GetX() - pLink1->GetX()), 0.0f);
+					forward.Normalise();
+					if (ThePaths.m_pathNodes[node].HasDivider()) {
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() + (length * 0.5f + ThePaths.m_pathNodes[node].GetDividerWidth()) * forward,
+							ThePaths.m_pathNodes[node].GetPosition() + ThePaths.m_pathNodes[node].GetDividerWidth() * forward);
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() - ThePaths.m_pathNodes[node].GetDividerWidth() * forward,
+							ThePaths.m_pathNodes[node].GetPosition() - (length * 0.5f + ThePaths.m_pathNodes[node].GetDividerWidth()) * forward);
+					}
+					else {
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() + (length * 0.5f) * forward,
+							ThePaths.m_pathNodes[node].GetPosition() - (length * 0.5f) * forward);
 					}
 				}
 			}
-		} else {
+		}
+		else {
 			InOrOut[nRoadblockNode] = false;
 		}
 	}
+	int i = CTimer::GetFrameCounter() & 0xF;
+	if (!aScriptRoadBlocks[i].m_bInUse)
+		return;
+	if ((aScriptRoadBlocks[i].GetPosition() - FindPlayerCoors()).Magnitude() < 100.0f) {
+		CreateRoadBlockBetween2Points(aScriptRoadBlocks[i].m_vInf, aScriptRoadBlocks[i].m_vSup);
+		aScriptRoadBlocks[i].m_bInUse = false;
+	}
+}
+
+void
+CRoadBlocks::ClearScriptRoadBlocks(void)
+{
+	for (int i = 0; i < NUM_SCRIPT_ROADBLOCKS; i++)
+		aScriptRoadBlocks[i].m_bInUse = false;
+}
+
+void
+CRoadBlocks::RegisterScriptRoadBlock(CVector vInf, CVector vSup)
+{
+	int32 i;
+	for (i = 0; i < NUM_SCRIPT_ROADBLOCKS; i++) {
+		if (!aScriptRoadBlocks[i].m_bInUse)
+			break;
+	}
+	if (i == NUM_SCRIPT_ROADBLOCKS)
+		return;
+	aScriptRoadBlocks[i].m_bInUse = true;
+	aScriptRoadBlocks[i].m_vInf = vInf;
+	aScriptRoadBlocks[i].m_vSup = vSup;
+}
+
+void 
+CRoadBlocks::CreateRoadBlockBetween2Points(CVector point1, CVector point2)
+{
+#ifdef SECUROM
+	if (roadBlocksPirateCheck == 0)
+		// if not pirated game
+		// roadBlocksPirateCheck = 1;
+		// else
+		roadBlocksPirateCheck = 2;
+#endif
+	CMatrix tmp;
+	CVector forward = (point2 - point1);
+	float distBetween = forward.Magnitude();
+	CVector pos = (point1 + point2) / 2;
+	CVector right(forward.y, -forward.x, 0.0f);
+	forward.Normalise();
+	right.Normalise();
+	if (DotProduct(FindPlayerCoors() - pos, right) < 0.0f) {
+		right *= -1.0f;
+	}
+	int32 vehicleId = MI_POLICE;
+	if (FindPlayerPed()->m_pWanted->AreArmyRequired())
+		vehicleId = MI_BARRACKS;
+	else if (FindPlayerPed()->m_pWanted->AreFbiRequired())
+		vehicleId = MI_FBICAR;
+	else if (FindPlayerPed()->m_pWanted->AreSwatRequired())
+		vehicleId = MI_ENFORCER;
+	if (!CStreaming::HasModelLoaded(vehicleId))
+		vehicleId = MI_POLICE;
+	CColModel* pVehicleColModel = CModelInfo::GetModelInfo(vehicleId)->GetColModel();
+	float fModelRadius = 2.0f * pVehicleColModel->boundingSphere.radius + 0.25f;
+	int16 numRoadblockVehicles = Min(6, (int16)(distBetween / fModelRadius));
+	for (int16 i = 0; i < numRoadblockVehicles; i++) {
+		float offset = fModelRadius * (i - numRoadblockVehicles / 2);
+		tmp.SetTranslate(0.0f, 0.0f, 0.0f);
+		tmp.GetRight() = CVector(forward.y, -forward.x, 0.0f);
+		tmp.GetForward() = forward;
+		tmp.GetUp() = CVector(0.0f, 0.0f, 1.0f);
+		tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f);
+		if (CGeneral::GetRandomNumber() & 1)
+			tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f + 3.1416f);
+		tmp.SetTranslateOnly(offset * forward + pos);
+		tmp.GetPosition().z += 0.6f;
+		float fModelRadius = CModelInfo::GetModelInfo(vehicleId)->GetColModel()->boundingSphere.radius - 0.25f;
+		int16 colliding = 0;
+		CWorld::FindObjectsKindaColliding(tmp.GetPosition(), fModelRadius, 0, &colliding, 2, nil, false, true, true, false, false);
+		if (!colliding) {
+			CAutomobile* pVehicle = new CAutomobile(vehicleId, RANDOM_VEHICLE);
+			pVehicle->SetStatus(STATUS_ABANDONED);
+			// pVehicle->GetHeightAboveRoad(); // called but return value is ignored?
+			tmp.GetPosition().z += fModelRadius - 0.6f;
+			pVehicle->SetMatrix(tmp);
+			pVehicle->PlaceOnRoadProperly();
+			pVehicle->SetIsStatic(false);
+			pVehicle->GetMatrix().UpdateRW();
+			pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+			CCarCtrl::JoinCarWithRoadSystem(pVehicle);
+			pVehicle->bIsLocked = false;
+			pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
+			pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+			pVehicle->AutoPilot.m_nNextLane = pVehicle->AutoPilot.m_nCurrentLane = 0;
+			pVehicle->AutoPilot.m_nCruiseSpeed = pVehicle->AutoPilot.m_fMaxTrafficSpeed = 0;
+			pVehicle->bExtendedRange = true;
+			if (pVehicle->UsesSiren() && CGeneral::GetRandomNumber() & 1)
+				pVehicle->m_bSirenOrAlarm = true;
+			if (pVehicle->GetUp().z > 0.94f) {
+				CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
+				CWorld::Add(pVehicle);
+				pVehicle->bCreateRoadBlockPeds = true;
+				pVehicle->m_nRoadblockType = DotProduct(pVehicle->GetRight(), pVehicle->GetPosition() - FindPlayerCoors()) >= 0.0f;
+				pVehicle->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 7000;
+			}
+			else {
+				delete pVehicle;
+			}
+		}
+	}
+	int numBarriers = distBetween / ROADBLOCK_OBJECT_WIDTH;
+	CStreaming::RequestModel(MI_ROADWORKBARRIER1, STREAMFLAGS_DONT_REMOVE);
+	if (!CStreaming::HasModelLoaded(MI_ROADWORKBARRIER1))
+		return;
+	for (int i = 0; i < numBarriers; i++) {
+		float offset = ROADBLOCK_OBJECT_WIDTH * (i - numBarriers / 2);
+		tmp.SetTranslate(0.0f, 0.0f, 0.0f);
+		tmp.GetRight() = CVector(forward.y, -forward.x, 0.0f);
+		tmp.GetForward() = forward;
+		tmp.GetUp() = CVector(0.0f, 0.0f, 1.0f);
+		tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f);
+		tmp.SetTranslateOnly(5.0f * right + offset * forward + pos);
+		tmp.GetPosition().x += (CGeneral::GetRandomNumber() & 0xF) * 0.1f;
+		tmp.GetPosition().y += (CGeneral::GetRandomNumber() & 0xF) * 0.1f;
+		bool found;
+		tmp.GetPosition().z = CWorld::FindGroundZFor3DCoord(tmp.GetPosition().x, tmp.GetPosition().y, tmp.GetPosition().z + 2.0f, &found);
+		if (!found)
+			continue;
+		int16 colliding = 0;
+		CBaseModelInfo* pMI = CModelInfo::GetModelInfo(MI_ROADWORKBARRIER1);
+		tmp.GetPosition().z -= pMI->GetColModel()->boundingBox.min.z;
+		CWorld::FindObjectsKindaColliding(tmp.GetPosition(), pMI->GetColModel()->boundingSphere.radius, 0, &colliding, 2, nil, false, true, true, false, false);
+		if (colliding == 0) {
+			CObject* pObject = new CObject(MI_ROADWORKBARRIER1, true);
+			pObject->GetMatrix() = tmp;
+			pObject->ObjectCreatedBy = TEMP_OBJECT;
+			pObject->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 600000;
+			CWorld::Add(pObject);
+		}
+	}
 }