From 43bd2227a8e3be1e6d8c133acdfe27a1962e25e1 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 31 Jan 2020 12:23:15 +0200
Subject: CRemote

---
 src/core/AnimViewer.cpp  |  2 +-
 src/core/Camera.h        | 14 ++++++++++++++
 src/core/CutsceneMgr.cpp |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 86b22ec5..a2d7b94a 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -289,7 +289,7 @@ CAnimViewer::Update(void)
 			}
 			newEntity->GetPosition() = CVector(0.0f, 0.0f, 0.0f);
 			CWorld::Add(newEntity);
-			TheCamera.TakeControl(pTarget, 9, 2, 1);
+			TheCamera.TakeControl(pTarget, CCam::MODE_MODELVIEW, JUMP_CUT, CAM_CONTROLLER_1);
 		}
 		if (pTarget->m_type == ENTITY_TYPE_VEHICLE || pTarget->m_type == ENTITY_TYPE_PED || pTarget->m_type == ENTITY_TYPE_OBJECT) {
 			((CPhysical*)pTarget)->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 8f0e62d4..99028de6 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -239,6 +239,20 @@ enum
 	MBLUR_UNUSED,		// pinkish
 };
 
+enum
+{
+	NONE = 0,
+	INTERPOLATION,
+	JUMP_CUT
+};
+
+enum
+{
+	CAM_CONTROLLER_0,
+	CAM_CONTROLLER_1,
+	CAM_CONTROLLER_2
+};
+
 struct CCamera : public CPlaceable
 {
 	bool m_bAboveGroundTrainNodesLoaded;
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index 2fbc5186..3df81b2b 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -256,7 +256,7 @@ void
 CCutsceneMgr::SetupCutsceneToStart(void)
 {
 	TheCamera.SetCamCutSceneOffSet(ms_cutsceneOffset);
-	TheCamera.TakeControlWithSpline(2);
+	TheCamera.TakeControlWithSpline(JUMP_CUT);
 	TheCamera.SetWideScreenOn();
 
 	ms_cutsceneOffset.z++;
-- 
cgit v1.2.3