- attempt to fix chase recorder & auto-test

Author: SoapyMan

src_rebuild/Game/C/cutrecorder.c

@@ -5,6 +5,7 @@
 #ifdef CUTSCENE_RECORDER
 
 #include "driver2.h"
+#include "cutrecorder.h"
 
 #include "main.h"
 #include "pad.h"
@@ -118,7 +119,7 @@ int CutRec_GotoChase(int number)
 
 void CutRec_Step()
 {
-	if (gCutsceneChaseAutoTest != 0)
+	if (gCutsceneChaseAutoTest != 0 && CutRec_IsPlaying())
 	{
 		// goto previous chase
 		if (Pads[0].dirnew & CAR_PAD_LEFT)
@@ -411,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)
@@ -425,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;
 	}
 
@@ -788,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.h

@@ -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/main.c

@@ -918,7 +918,7 @@ void StepSim(void)
 	// control civcars pingin/pingout
 	if (requestStationaryCivCar != 1 && requestRoadblock == 0)
 	{
-		if (gInGameChaseActive)
+		if (gInGameChaseActive || _CutRec_IsPlaying())
 		{
 			// it will use ping buffer
 			// checks are done internally

src_rebuild/Game/C/replays.c

@@ -364,7 +364,7 @@ char GetPingInfo(char *cookieCount)
 // [A] returns 1 if can use ping buffer
 int IsPingInfoAvailable()
 {
-	if (!_CutRec_IsAutoTestOn() && (gUseStoredPings == 0 || gInGameChaseActive == 0))// && gLoadedReplay == 0)
+	if (!_CutRec_IsPlaying() && (gUseStoredPings == 0 || gInGameChaseActive == 0))// && gLoadedReplay == 0)
 		return 0;
 
 	return PingBuffer != NULL && PingBufferPos < MAX_REPLAY_PINGS;