The Most Awesome PR!

src_rebuild/DebugOverlay.cpp

@@ -95,6 +95,8 @@ void DrawDebugOverlays()
 		extern int numParkedCars;
 		extern int maxCopCars;
 		extern int maxCivCars;
+		extern int num_pedestrians;
+		extern int max_pedestrians;
 		extern int current_region;
 		extern int LoadedArea;
 
@@ -103,7 +105,7 @@ void DrawDebugOverlays()
 		sprintf(tempBuf, "Spooling: %d spec: %d, active: %d, Reg: %d, Ar: %d, Cn: %d %d", doSpooling, allowSpecSpooling, spoolactive, current_region, LoadedArea, spoolptr->connected_areas[0] & 0x3f, spoolptr->connected_areas[1] & 0x3f);
 		PrintString(tempBuf, 10, 30);
 
-		sprintf(tempBuf, "Civs: %d - %d parked - max %d", numCivCars, numParkedCars, maxCivCars);
+		sprintf(tempBuf, "Civs: %d - %d parked - max %d, Peds: %d - max %d", numCivCars, numParkedCars, maxCivCars, num_pedestrians, max_pedestrians);
 		PrintString(tempBuf, 10, 40);
 
 		sprintf(tempBuf, "Cops: %d - %d active - max %d - seen: %d", numCopCars, numActiveCops, maxCopCars, CopsCanSeePlayer);

src_rebuild/Game/C/bcollide.c

@@ -14,6 +14,7 @@
 #include "objanim.h"
 #include "system.h"
 #include "cutscene.h"
+#include "event.h"
 
 extern int gCameraBoxOverlap;
 
@@ -678,6 +679,7 @@ int CarBuildingCollision(CAR_DATA *cp, BUILDING_BOX *building, CELL_OBJECT *cop,
 
 #if defined(COLLISION_DEBUG) && !defined(PSX)
 		extern int gShowCollisionDebug;
+		extern SVECTOR boatOffset;
 		if (gShowCollisionDebug == 1)
 		{
 			extern void Debug_AddLine(VECTOR & pointA, VECTOR & pointB, CVECTOR & color);
@@ -687,13 +689,30 @@ int CarBuildingCollision(CAR_DATA *cp, BUILDING_BOX *building, CELL_OBJECT *cop,
 			CVECTOR rrcv = { 250, 0, 0 };
 			CVECTOR yycv = { 250, 250, 0 };
 
+			VECTOR offset = { 0 };
+
 			// show both box axes
 			{
 				VECTOR _zero = { 0 };
 				VECTOR b1p = cd[0].x;
 				VECTOR b2p = cd[1].x;
 				b2p.vy = b1p.vy;
 
+				if (carsOnBoat.count != 0 && carsOnBoat.cars[cp->id])
+				{
+					offset.vx = boatOffset.vx;
+					offset.vy = boatOffset.vy;
+					offset.vz = boatOffset.vz;
+
+					b1p.vx -= offset.vx;
+					b1p.vy -= offset.vy;
+					b1p.vz -= offset.vz;
+
+					b2p.vx -= offset.vx;
+					b2p.vy -= offset.vy;
+					b2p.vz -= offset.vz;
+				}
+
 				// show position to position
 				//Debug_AddLine(b1p1, b2p1, yycv);
 

src_rebuild/Game/C/camera.c

@@ -415,7 +415,7 @@ short gCameraDefaultScrZ = 256;
 
 
 CAR_DATA *jcam = NULL;
-int switch_detail_distance = 10000;
+int switch_detail_distance = SWITCH_LOD_DIST;
 
 // [D] [T]
 void PlaceCameraFollowCar(PLAYER *lp)
@@ -545,7 +545,7 @@ void PlaceCameraFollowCar(PLAYER *lp)
 	camera_angle.vz = 0;
 
 	SetGeomScreen(scr_z = gCameraDefaultScrZ);
-	switch_detail_distance = 10000;
+	switch_detail_distance = SWITCH_LOD_DIST;
 
 	BuildWorldMatrix();
 }
@@ -651,7 +651,7 @@ void PlaceCameraInCar(PLAYER *lp, int BumperCam)
 
 	SetGeomScreen(scr_z = gCameraDefaultScrZ);
 
-	switch_detail_distance = 10000;
+	switch_detail_distance = SWITCH_LOD_DIST;
 }
 
 // [D] [T]
@@ -727,6 +727,6 @@ void PlaceCameraAtLocation(PLAYER* lp, int zoom)
 		scr_z = gCameraDefaultScrZ;
 
 	SetGeomScreen(scr_z);
-	switch_detail_distance = 10000 + (d >> 1);
+	switch_detail_distance = SWITCH_LOD_DIST + (d >> 1);
 	BuildWorldMatrix();
 }

src_rebuild/Game/C/cars.c

@@ -29,13 +29,6 @@ struct plotCarGlobals
 	u_char* damageLevel;
 };
 
-
-#ifndef PSX
-#define CAR_LOD_SWITCH_DISTANCE switch_detail_distance
-#else
-#define CAR_LOD_SWITCH_DISTANCE 5500
-#endif
-
 MATRIX light_matrix =
 { 
 	{ 
@@ -1508,11 +1501,22 @@ void DrawCar(CAR_DATA* cp, int view)
 			AddSmokingEngine(cp, doSmoke - 1, WheelSpeed);
 
 #if ENABLE_GAME_ENCHANCEMENTS
-		AddExhaustSmoke(cp, doSmoke > 1, WheelSpeed);
+		if (pos.vz < (CAR_LOD_SWITCH_DISTANCE / 2) + 750)
+			AddExhaustSmoke(cp, doSmoke > 1, WheelSpeed);
 #endif
 
+#ifndef PSX
+		SetShadowPoints(cp, corners);
+
+		// do simple shadows when further away
+		if (pos.vz >= CAR_LOD_SWITCH_DISTANCE / 4)
+			PlaceShadowForCar(corners, 0, 10, yVal < 0 ? 0 : 2);
+		else
+			PlaceShadowForCar(corners, 4, 10, yVal < 0 ? 0 : 2);
+#else
 		SetShadowPoints(cp, corners);
 		PlaceShadowForCar(corners, 4, 10, yVal < 0 ? 0 : 2);
+#endif
 
 		ComputeCarLightingLevels(cp, 1);
 
@@ -1573,7 +1577,7 @@ void DrawCar(CAR_DATA* cp, int view)
 	if(CarHasSiren(cp->ap.model))
 	{
 		if ((IS_ROADBLOCK_CAR(cp) || cp->controlType == CONTROL_TYPE_PURSUER_AI) ||		// any regular cop car including roadblock
-			gInGameCutsceneActive && cp->controlType == CONTROL_TYPE_CUTSCENE && force_siren[CAR_INDEX(cp)] != 0 ||		// any car with siren in cutscene
+			gInGameCutsceneActive && cp->controlType == CONTROL_TYPE_CUTSCENE && CARNOISE_HAS_FORCED_SIREN(CAR_INDEX(cp)) != 0 ||		// any car with siren in cutscene
 			gCurrentMissionNumber == 26 && cp->controlType == CONTROL_TYPE_CUTSCENE && cp->ap.model == 4)				// Vegas ambulance
 		{
 			if (cp->ai.p.dying < 75)

src_rebuild/Game/C/cars.h

@@ -6,6 +6,12 @@
 
 #define IS_ROADBLOCK_CAR(cp) (cp->controlType == CONTROL_TYPE_CIV_AI && (cp->controlFlags & CONTROL_FLAG_COP_SLEEPING))
 
+#ifndef PSX
+#define CAR_LOD_SWITCH_DISTANCE (switch_detail_distance+500)
+#else
+#define CAR_LOD_SWITCH_DISTANCE 5500
+#endif
+
 // PHYSICS
 extern CAR_DATA car_data[MAX_CARS + 2];	// all cars + Tanner cbox + Camera cbox
 

src_rebuild/Game/C/civ_ai.c

@@ -25,6 +25,7 @@
 #include "overlay.h"
 #include "cutrecorder.h"
 #include "draw.h"
+#include "glaunch.h"
 
 const u_char speedLimits[3] = { 56, 97, 138 };
 
@@ -85,6 +86,15 @@ int test555 = 0;
 	cp->ai.c.thrustState = 3; cp->ai.c.ctrlState = 7;
 #endif
 
+#ifndef PSX
+char UglyLowCarLODs[4][10] = {
+	{ 0,0,0,0,0, 1,0,0,0, 0 },
+	{ 0,0,0,0,0, 0,0,0,0, 0 },
+	{ 0,0,0,0,0, 0,0,1,1, 0 },
+	{ 1,0,0,0,0, 1,1,1,0, 0 },
+};
+#endif
+
 // [D] [T]
 int InitCar(CAR_DATA* cp, int direction, LONGVECTOR4* startPos, unsigned char control, int model, int palette, char* extraData)
 {
@@ -159,6 +169,16 @@ int InitCar(CAR_DATA* cp, int direction, LONGVECTOR4* startPos, unsigned char co
 			break;
 	}
 
+#ifndef PSX
+	int rm = MissionHeader->residentModels[cp->ap.model];
+
+	if (rm >= 8)
+		rm -= 3;
+
+	if (UglyLowCarLODs[GameLevel][rm])
+		cp->controlFlags |= CONTROL_FLAG_DONT_USE_LOW_LOD;
+#endif
+
 	CreateDentableCar(cp);
 	DentCar(cp);
 
@@ -1741,8 +1761,30 @@ int TrafficLightCycle(int exit)
 	return 2;
 }
 
+struct TRAFFIC_DENSITY_DATA
+{
+	int maxCivCars;
+	int maxParkedCars;
+};
+
+TRAFFIC_DENSITY_DATA trafficDensityMap[2][4] = {
+	{
+		{ 14, 7 },
+		{ 25, 11 },
+		{ 40, 24 },
+		{ 64, 32 },
+	},
+	{
+		// recording-specific densities
+		{ 14, 7 },
+		{ 25, 11 },
+		{ 32, 24 }, // <-- recordings have fixed limits above Medium
+		{ 32, 24 },
+	},
+};
+
 // [D] [T]
-void InitCivCars(void)
+void InitCivCars(/*[A]*/int recording)
 {
 	PingBufferPos = 0;
 	cookieCount = 0;
@@ -1763,6 +1805,22 @@ void InitCivCars(void)
 	testNumPingedOut = 0;
 	currentAngle = 0;
 	closeEncounter = 3;
+
+#ifndef PSX
+	if (gExtraConfig.gTrafficDensity != 0)
+	{
+		TRAFFIC_DENSITY_DATA *trafficDensity = &trafficDensityMap[recording & 1][(gExtraConfig.gTrafficDensity - 1) & 3];
+
+		maxCivCars = trafficDensity->maxCivCars;
+		maxParkedCars = trafficDensity->maxParkedCars;
+	}
+	else
+	{
+		// make sure we always have the bare minimum amount available
+		maxCivCars = 14;
+		maxParkedCars = 7;
+	}
+#endif
 }
 
 const int EVENT_CAR_SPEED = 60;
@@ -2304,20 +2362,18 @@ int PingInCivCar(int minPingInDist)
 	{
 		int theta;
 		int minDistAlong;
-		int scDist;
 
+		// don't spawn outside straight
 		if (requestCopCar == 0)
 		{
-			scDist = lbody * 2;
 			minDistAlong = lbody * 3;
 		}
 		else
 		{
-			scDist = lbody * 2;
 			minDistAlong = 0;
 		}
 
-		if (roadInfo.straight->length <= (scDist + lbody) * 2) // don't spawn outside straight
+		if (roadInfo.straight->length <= lbody * 6)
 			return 0;
 
 		dx = randomLoc.vx - roadInfo.straight->Midx;
@@ -2470,6 +2526,19 @@ int PingInCivCar(int minPingInDist)
 	{
 		numParkedCars++;
 
+		if (gExtraConfig.m.AllowParkedTurnedWheels)
+		{
+			int tmp = ((Random2(0) & 0xff) + 1536) & 0x1ff;
+
+			if (FrameCnt % 16)
+			{
+				if (tmp & 8)
+					tmp = -tmp;
+
+				newCar->wheel_angle = tmp;
+			}
+		}
+
 		// parked car is going to unpark
 		if (newCar->ai.c.thrustState == 3)
 			newCar->controlFlags |= CONTROL_FLAG_WAS_PARKED;
@@ -3648,9 +3717,11 @@ int CivControl(CAR_DATA* cp)
 			steer = CivSteerAngle(cp);
 
 		thrust = CivAccel(cp);
-		if (thrust != 0) // [A] reduce acceleration when steering is applied
-			thrust = CivAccel(cp) - MAX(ABS(steer), 4) * 3;
 
+		// [A] reduce acceleration when steering is applied
+		if (thrust != 0)
+			thrust -= MAX(ABS(steer), 4) * 3;
+
 		// [A] fix backwards crawl
 		if (thrust < 0 && cp->hd.wheel_speed < 100)
 			thrust = 0;

src_rebuild/Game/C/civ_ai.h

@@ -23,7 +23,7 @@ extern char makeLimoPullOver;
 
 extern char junctionLightsPhase[2];
 
-extern void InitCivCars(); // 0x0002CDA4
+extern void InitCivCars(int recording); // 0x0002CDA4
 
 extern int InitCar(CAR_DATA *cp, int direction, LONGVECTOR4* startPos, unsigned char control, int model, int palette, char *extraData); // 0x00023DE8
 extern int InitCivState(CAR_DATA* cp, EXTRA_CIV_DATA* extraData); // 0x000280D8

src_rebuild/Game/C/convert.c

@@ -68,18 +68,8 @@ void BuildWorldMatrix(void)
 {
 	MATRIX newmatrix;
 
-	newmatrix.m[0][0] = ONE;
-	newmatrix.m[1][0] = 0;
-	newmatrix.m[2][0] = 0;
-
-	newmatrix.m[0][1] = 0;
-	newmatrix.m[1][1] = ONE;
-	newmatrix.m[2][1] = 0;
-
-	newmatrix.m[0][2] = 0;
-	newmatrix.m[1][2] = 0;
-	newmatrix.m[2][2] = ONE;
-
+	InitMatrix(newmatrix);
+
 	_RotMatrixY(&newmatrix, camera_angle.vy);
 	_RotMatrixZ(&newmatrix, camera_angle.vz);
 	_RotMatrixX(&newmatrix, camera_angle.vx);
@@ -115,18 +105,8 @@ void ScaleCamera(void)
 	RotMatrixYXZ(&tempang, &temp);
 	InvertMatrix(&temp, &temp2);
 
-	scale.m[0][0] = ONE;
-	scale.m[0][1] = 0;
-	scale.m[0][2] = 0;
-
-	scale.m[1][0] = 0;
-	scale.m[1][1] = ONE;
-	scale.m[1][2] = 0;
-
-	scale.m[2][0] = 0;
-	scale.m[2][1] = 0;
-	scale.m[2][2] = ONE;
-
+	InitMatrix(scale);
+
 	MulMatrix0(&scale, &inv_camera_matrix, &scaledcammat);
 	TransMatrix(&scaledcammat, &pos);
 	SetRotMatrix(&scaledcammat);

src_rebuild/Game/C/cutrecorder.c

@@ -545,6 +545,11 @@ int CutRec_LoadCutsceneAsReplayFromBuffer(char* buffer)
 	NumPlayers = header->NumPlayers;
 	gRandomChase = header->RandomChase;
 	CutsceneEventTrigger = header->CutsceneEvent;
+
+	StoreGameVars(1);
+
+	LoadExtraData(&header->ExtraData, 0);
+
 	gCopDifficultyLevel = header->gCopDifficultyLevel;
 	ActiveCheats = header->ActiveCheats; // TODO: restore old value
 
@@ -640,7 +645,7 @@ int CutRec_LoadCutsceneAsReplayFromBuffer(char* buffer)
 
 	replayptr = (char*)(PingBuffer + MAX_REPLAY_PINGS);
 
-	if (header->HaveStoredData == 0x91827364)	// -0x6e7d8c9c
+	if (header->HaveStoredData == 0x91827364)
 	{
 		memcpy((u_char*)&MissionStartData, (u_char*)pt, sizeof(MISSION_DATA));
 		gHaveStoredData = 1;
@@ -710,10 +715,12 @@ int CutRec_SaveReplayToBuffer(char* buffer)
 	// [A] is that ever valid?
 	if (gHaveStoredData)
 	{
-		header->HaveStoredData = 0x91827364;	// -0x6e7d8c9c
+		header->HaveStoredData = 0x91827364;
 		memcpy((u_char*)pt, (u_char*)&MissionStartData, sizeof(MISSION_DATA));
 	}
 
+	SaveExtraData(&header->ExtraData, 0);
+
 	return pt - buffer;
 }