Merge pull request #139 from OpenDriver2/develop-SoapyMan

Beta 3 bug fixes

Author: SoapyMan

.emscripten/notes.md

@@ -1,4 +1,4 @@
-version: 7.2.{build}
+version: 7.4.{build}
 
 branches:
   only:

appveyor.yml

@@ -94,15 +94,19 @@ void DrawDebugOverlays()
 		PrintString(tempBuf, 10, 20);
 
 		extern volatile int spoolactive;
-		sprintf(tempBuf, "Spooling: %d spec: %d, active: %d", doSpooling, allowSpecSpooling, spoolactive);
-		PrintString(tempBuf, 10, 30);
-
 		extern int numActiveCops;
 		extern int numCopCars;
 		extern int numCivCars;
 		extern int numParkedCars;
 		extern int maxCopCars;
 		extern int maxCivCars;
+		extern int current_region;
+		extern int LoadedArea;
+
+		Spool* spoolptr = (Spool*)(RegionSpoolInfo + spoolinfo_offsets[current_region]);
+
+		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);
 		PrintString(tempBuf, 10, 40);
@@ -182,12 +186,18 @@ void DrawDebugOverlays()
 				);
 
 				PrintString(tempBuf, 10, 195);
+
+				sprintf(tempBuf, "c %d %d %d %d",
+					(int)(*roadInfo.ConnectIdx)[0], (int)(*roadInfo.ConnectIdx)[1], (int)(*roadInfo.ConnectIdx)[2], (int)(*roadInfo.ConnectIdx)[3]);
+
+				PrintString(tempBuf, 10, 205);
 			}
 			else if(IS_JUNCTION_SURFACE(roadInfo.surfId))
 			{
 				DRIVER2_JUNCTION* junc = GET_JUNCTION(roadInfo.surfId);
 
-				sprintf(tempBuf, "JUN %d flg %d",roadInfo.surfId, junc->flags);
+				sprintf(tempBuf, "JUN %d flg %d - c %d %d %d %d",roadInfo.surfId, junc->flags, 
+					(int)(*roadInfo.ConnectIdx)[0], (int)(*roadInfo.ConnectIdx)[1], (int)(*roadInfo.ConnectIdx)[2], (int)(*roadInfo.ConnectIdx)[3]);
 
 				PrintString(tempBuf, 10, 180);
 			}

src_rebuild/DebugOverlay.cpp

@@ -70,7 +70,7 @@ int TannerStuckInCar(int doSpeedCheck, int player_id)
 			playerFelony = &cp->felonyRating;
 		}
 
-		if ((*playerFelony <= FELONY_MIN_VALUE || player_position_known < 1) &&
+		if ((*playerFelony <= FELONY_PURSUIT_MIN_VALUE || player_position_known < 1) &&
 			cp &&
 			(cp->hd.wheel[1].surface & 7) != 1 &&
 			(cp->hd.wheel[3].surface & 7) != 1)

src_rebuild/Game/C/ai.c

@@ -45,8 +45,8 @@ int bcollided2d(CDATA2D *body, int* boxOverlap)
 	}
 
 	// hmmm, why?
-	as = rcossin_tbl[(dtheta & 0x7ff) * 2];
-	ac = rcossin_tbl[(dtheta + 1024 & 0x7ff) * 2];
+	as = RSIN(dtheta & 0x7ff);			// rcossin_tbl[(dtheta & 0x7ff) * 2];
+	ac = RSIN(dtheta + 1024 & 0x7ff);	// rcossin_tbl[(dtheta + 1024 & 0x7ff) * 2];
 
 	delta.vx = body[0].x.vx - body[1].x.vx;
 	delta.vz = body[0].x.vz - body[1].x.vz;

src_rebuild/Game/C/bcollide.c

@@ -535,7 +535,7 @@ int GetNextRoadInfo(CAR_DATA* cp, int randomExit, int* turnAngle, int* startDist
 			exitCnt++;
 		} while (exitCnt < 3);
 
-		if (leftLane != rightLane && numExits != 1)
+		if (leftLane != rightLane && numExits != 1 && ROAD_LANES_COUNT(&currentRoadInfo) > 1)
 		{
 			if (cp->ai.c.currentLane == leftLane)
 			{

src_rebuild/Game/C/civ_ai.c

@@ -216,7 +216,7 @@ void UpdateCopSightData(void)
 	else
 		playerFelony = &car_data[player[0].playerCarId].felonyRating;
 
-	if (*playerFelony > FELONY_MIN_VALUE)
+	if (*playerFelony > FELONY_PURSUIT_MIN_VALUE)
 	{
 		copSightData.surroundViewDistance = 5440;
 		copSightData.frontViewDistance = 16320;
@@ -858,7 +858,7 @@ void ControlCopDetection(void)
 	}
 
 	// [A] if Tanner is outside car, cops can arrest him if they are too close
-	if(player[0].playerType == 2 && minDistanceToPlayer < 2048 && !player[0].dying && pedestrianFelony > FELONY_MIN_VALUE)
+	if(player[0].playerType == 2 && minDistanceToPlayer < 2048 && !player[0].dying && pedestrianFelony > FELONY_PURSUIT_MIN_VALUE)
 	{
 		player[0].dying = 1;
 
@@ -963,7 +963,7 @@ void PassiveCopTasks(CAR_DATA *cp)
 	else 
 		playerFelony = &car_data[player[0].playerCarId].felonyRating;
 
-	if (*playerFelony <= FELONY_MIN_VALUE)
+	if (*playerFelony <= FELONY_PURSUIT_MIN_VALUE)
 		return;
 
 	// [A] make an ambush on player in Destroy the yard
@@ -1136,7 +1136,9 @@ void ControlCops(void)
 		// play the phrases about direction
 		if (first_offence == 0 && CopsCanSeePlayer && numActiveCops != 0)
 		{
-			if (*playerFelony > 658 && TimeSinceLastSpeech > 720 && targetVehicle->hd.speed > 20)
+			if (*playerFelony > FELONY_PURSUIT_MIN_VALUE && 
+				TimeSinceLastSpeech > 720 && 
+				targetVehicle->hd.speed > 20)
 			{
 				int rnd;
 				heading = GetCarDirectionOfTravel(targetVehicle);
@@ -1182,7 +1184,7 @@ void ControlCops(void)
 		if (CopsCanSeePlayer && OutOfSightCount < 256 ||	// [A] was player_position_known. Resolves speech in some missions
 			player_position_known > 1 && GameType == GAME_GETAWAY)
 		{
-			if (*playerFelony > FELONY_MIN_VALUE)
+			if (*playerFelony > FELONY_PURSUIT_MIN_VALUE)
 				copsWereInPursuit = 1;
 		}
 

src_rebuild/Game/C/cop_ai.c

@@ -5,6 +5,7 @@
 #ifdef CUTSCENE_RECORDER
 
 #include "driver2.h"
+#include "cutrecorder.h"
 
 #include "main.h"
 #include "pad.h"
@@ -118,53 +119,53 @@ int CutRec_GotoChase(int number)
 
 void CutRec_Step()
 {
-	// goto previous chase
-	if (Pads[0].dirnew & CAR_PAD_LEFT)
+	if (gCutsceneChaseAutoTest != 0 && CutRec_IsPlaying())
 	{
-		CutRec_GotoChase(gCutsceneChaseAutoTest - 1);
-		return;
-	}
+		// goto previous chase
+		if (Pads[0].dirnew & CAR_PAD_LEFT)
+		{
+			CutRec_GotoChase(gCutsceneChaseAutoTest - 1);
+			return;
+		}
 
-	// goto next chase
-	if (Pads[0].dirnew & CAR_PAD_RIGHT)
-	{
-		CutRec_GotoChase(gCutsceneChaseAutoTest + 1);
-		return;
-	}
-	
-	if (!pauseflag)
-	{
-		if(gCutsceneChaseAutoTest != 0)
+		// goto next chase
+		if (Pads[0].dirnew & CAR_PAD_RIGHT)
+		{
+			CutRec_GotoChase(gCutsceneChaseAutoTest + 1);
+			return;
+		}
+
+		if (!pauseflag)
 		{
 			int carId = player[gCutsceneAsReplay_PlayerId].playerCarId;
-			
+
 			if (car_data[carId].hd.speed < 5)
 				gChaseStuckTimer++;
 			else
 				gChaseStuckTimer = 0;
 
-			if(gChaseStuckTimer > 45)
+			if (gChaseStuckTimer > 45)
 			{
 				gAutoTestStats[gCutsceneChaseAutoTest].stuck = 1;
 				gChaseStuckTimer = 0;
 			}
-		}
-		
-		return;
-	}
 
-	if(gCutsceneChaseAutoTest != 0 && gCutsceneChaseAutoTest < 15 &&
-		NoPlayerControl && ReplayParameterPtr->RecordingEnd - 2 < CameraCnt || gDieWithFade)
-	{
-		gCutsceneChaseAutoTest++;
+			return;
+		}
 
-		// load next replay and restart
-		if (!CutRec_GotoChase(gCutsceneChaseAutoTest))
+		if (gCutsceneChaseAutoTest < 15 &&
+			(NoPlayerControl && ReplayParameterPtr->RecordingEnd - 2 < CameraCnt || gDieWithFade))
 		{
-			printInfo("------- AUTOTEST RESULTS -------\n");
-			for(int i = 0; i < 15; i++)
-				printInfo("  chase %d - hit cars: %d, stuck: %d\n", i, gAutoTestStats[i].numHitCars, gAutoTestStats[i].stuck);
-			printInfo("------- ---------------- -------\n");
+			gCutsceneChaseAutoTest++;
+
+			// load next replay and restart
+			if (!CutRec_GotoChase(gCutsceneChaseAutoTest))
+			{
+				printInfo("------- AUTOTEST RESULTS -------\n");
+				for (int i = 0; i < 15; i++)
+					printInfo("  chase %d - hit cars: %d, stuck: %d\n", i, gAutoTestStats[i].numHitCars, gAutoTestStats[i].stuck);
+				printInfo("------- ---------------- -------\n");
+			}
 		}
 	}
 }
@@ -200,12 +201,20 @@ void CutRec_Draw()
 		PrintString(text, 5, 215);
 	}
 
-	if (gAutoTestStats[gCutsceneChaseAutoTest].numHitCars > 0)
+	if(PingBufferPos >= MAX_REPLAY_PINGS-1)
 		SetTextColour(128, 0, 0);
 
-	sprintf(text, "Hit cars: %d", gAutoTestStats[gCutsceneChaseAutoTest].numHitCars);
+	sprintf(text, "Pings: %d", PingBufferPos);
 	PrintString(text, 5, 205);
 
+	SetTextColour(128, 128, 128);
+
+	if (gAutoTestStats[gCutsceneChaseAutoTest].numHitCars > 0)
+		SetTextColour(128, 0, 0);		
+
+	sprintf(text, "Hit cars: %d", gAutoTestStats[gCutsceneChaseAutoTest].numHitCars);
+	PrintString(text, 120, 205);
+
 	if(gAutoTestStats[gCutsceneChaseAutoTest].stuck)
 	{
 		SetTextColour(128, 0, 0);
@@ -403,10 +412,7 @@ int CutRec_StorePingInfo(int cookieCount, int carId)
 	PING_PACKET* buffer;
 	PING_PACKET* packet;
 
-	if (gCutsceneAsReplay == 0)
-		return 0;
-
-	if (CurrentGameMode == GAMEMODE_REPLAY || gInGameChaseActive != 0)
+	if (!CutRec_IsRecording())
 		return 0;
 
 	if (PingBufferPos < MAX_REPLAY_PINGS-1)
@@ -417,12 +423,16 @@ int CutRec_StorePingInfo(int cookieCount, int carId)
 
 		packet->cookieCount = cookieCount;
 
+		PingBuffer[PingBufferPos - 1] = *packet;
+
 		// always finalize last ping
 		packet = &NewPingBuffer[PingBufferPos];
 		packet->frame = 0xffff;
 		packet->carId = -1;
 		packet->cookieCount = -1;
 
+		
+
 		return 1;
 	}
 
@@ -780,4 +790,20 @@ int CutRec_RecordPad(CAR_DATA* cp, uint* t0, char* t1, char* t2)
 	return 1;
 }
 
+int	CutRec_IsRecording()
+{
+	if (gCutsceneAsReplay == 0)
+		return 0;
+
+	return CurrentGameMode != GAMEMODE_REPLAY;
+}
+
+int	CutRec_IsPlaying()
+{
+	if (gCutsceneAsReplay == 0)
+		return 0;
+
+	return CurrentGameMode == GAMEMODE_REPLAY;
+}
+
 #endif // CUTSCENE_RECORDER

src_rebuild/Game/C/cutrecorder.c

@@ -12,6 +12,9 @@ extern char gCurrentChasePauseText[64];
 extern void		InitChaseAutoTest(char* configFilename);
 extern void		InitCutsceneRecorder(char* configFilename);
 
+extern int		CutRec_IsRecording();
+extern int		CutRec_IsPlaying();
+
 extern void		CutRec_Reset();
 extern void		CutRec_Step();
 extern void		CutRec_Draw();
@@ -29,6 +32,8 @@ extern int		CutRec_SaveChase();
 
 #define _CutRec_IsAutoTestOn()				(gCutsceneChaseAutoTest != 0)
 #define _CutRec_IsOn()						(gCutsceneAsReplay != 0)
+#define _CutRec_IsRecording()				CutRec_IsRecording()
+#define _CutRec_IsPlaying()					CutRec_IsPlaying()
 #define _CutRec_Step()						CutRec_Step()
 #define _CutRec_Draw()						CutRec_Draw()
 #define _CutRec_Reset()						CutRec_Reset()
@@ -45,6 +50,8 @@ extern int		CutRec_SaveChase();
 
 #define _CutRec_IsAutoTestOn()				(0)
 #define _CutRec_IsOn()						(0)
+#define _CutRec_IsRecording()				(0)
+#define _CutRec_IsPlaying()					(0)
 #define _CutRec_Step()						(0)
 #define _CutRec_Draw()						(0)
 #define _CutRec_Reset()						(0)

src_rebuild/Game/C/cutrecorder.h

@@ -1023,7 +1023,7 @@ void AddGroundDebris(void)
 
 				seed = rand();
 
-				Position.vy = -cop->pos.vy - 45;
+				Position.vy = cop->pos.vy - 45;
 				Position.vx = cop->pos.vx + ((seed & 0x3ff) - 512);
 				Position.vz = cop->pos.vz + ((rand() & 0x3ff) - 512);