From 900d2680971c314c2dab59a6ec9fdaf470bb64b2 Mon Sep 17 00:00:00 2001
From: Ilya Shurumov <ishurumov@gmail.com>
Date: Tue, 19 May 2020 01:44:18 +0600
Subject: [PATCH] - fix bugs?

---
 src_rebuild/GAME/C/AI.C       | 4 +++-
 src_rebuild/GAME/C/CUTSCENE.H | 1 +
 src_rebuild/GAME/C/DIRECTOR.C | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src_rebuild/GAME/C/AI.C b/src_rebuild/GAME/C/AI.C
index f55cdf22..2c048395 100644
--- a/src_rebuild/GAME/C/AI.C
+++ b/src_rebuild/GAME/C/AI.C
@@ -129,13 +129,14 @@ int TannerCanEnterCar(_CAR_DATA *cp, int distToCarSq)
 	/* end block 3 */
 	// End Line: 650
 
+// [D]
 int TannerStuckInCar(int doSpeedCheck)
 {
 	short *psVar1;
 	int iVar2;
 	int iVar3;
 
-	_CAR_DATA *cp;
+	_CAR_DATA *cp = NULL;
 
 	if (NumPlayers < 2 && player[0].playerType == 1)
 	{
@@ -150,6 +151,7 @@ int TannerStuckInCar(int doSpeedCheck)
 		}
 
 		if ((*psVar1 < 0x293 || player_position_known < 1) &&
+			cp &&
 			(cp->hd.wheel[1].surface & 7) != 1 &&
 			(cp->hd.wheel[3].surface & 7) != 1)
 		{
diff --git a/src_rebuild/GAME/C/CUTSCENE.H b/src_rebuild/GAME/C/CUTSCENE.H
index 46a5117f..c8a90ccf 100644
--- a/src_rebuild/GAME/C/CUTSCENE.H
+++ b/src_rebuild/GAME/C/CUTSCENE.H
@@ -1,6 +1,7 @@
 #ifndef CUTSCENE_H
 #define CUTSCENE_H
 
+extern int gInGameCutsceneID;
 extern int gInGameCutsceneActive;
 extern int gInGameCutsceneDelay;
 extern int gInGameChaseActive;
diff --git a/src_rebuild/GAME/C/DIRECTOR.C b/src_rebuild/GAME/C/DIRECTOR.C
index 92f9903e..054ec36b 100644
--- a/src_rebuild/GAME/C/DIRECTOR.C
+++ b/src_rebuild/GAME/C/DIRECTOR.C
@@ -664,8 +664,8 @@ int IsMovingCamera(PLAYBACKCAMERA *lastcam, PLAYBACKCAMERA *nextcam, int camerac
 	if (lastcam == NULL)
 		return 0;
 
-	if (cameraview != 5 && cameraview != 1)
-		return 0;
+	//if (cameraview != 5 && cameraview != 1)
+	//	return 0;
 
 	bVar5 = nextcam->cameraview & 0x87;