From 537aaca5c200cb61928674303f7a24e3af29ad54 Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Sun, 27 Oct 2019 06:17:30 +0300 Subject: ControllerConfig done Fix Cam enum --- src/core/Camera.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/Camera.cpp') diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 20c2ebd0..3ab7d742 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -102,8 +102,8 @@ CCamera::IsBoxVisible(RwV3d *box, const CMatrix *mat) int CCamera::GetLookDirection(void) { - if(Cams[ActiveCam].Mode == CCam::MODE_CAMONASTRING || - Cams[ActiveCam].Mode == CCam::MODE_FIRSTPERSON || + if(Cams[ActiveCam].Mode == CCam::MODE_CAM_ON_A_STRING || + Cams[ActiveCam].Mode == CCam::MODE_1STPERSON || Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT || Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED) return Cams[ActiveCam].DirectionWasLooking; @@ -113,7 +113,7 @@ CCamera::GetLookDirection(void) bool CCamera::GetLookingForwardFirstPerson() { - return Cams[ActiveCam].Mode == CCam::MODE_FIRSTPERSON && + return Cams[ActiveCam].Mode == CCam::MODE_1STPERSON && Cams[ActiveCam].DirectionWasLooking == LOOKING_FORWARD; } @@ -1145,7 +1145,7 @@ CCam::FixCamIfObscured(CVector &TargetCoors, float TargetHeight, float TargetOri if(Mode == MODE_BEHINDCAR) Target.z += TargetHeight/2.0f; - if(Mode == MODE_CAMONASTRING){ + if(Mode == MODE_CAM_ON_A_STRING){ UseEntityPos = true; Target.z += TargetHeight/2.0f; EntityPos = CamTargetEntity->GetPosition(); @@ -1306,7 +1306,7 @@ CCam::Using3rdPersonMouseCam() (Mode == MODE_FOLLOWPED || TheCamera.m_bPlayerIsInGarage && FindPlayerPed() && FindPlayerPed()->m_nPedState != PED_DRIVING && - Mode != MODE_TOPDOWN1 && this->CamTargetEntity == FindPlayerPed()); + Mode != MODE_TOPDOWN && this->CamTargetEntity == FindPlayerPed()); } bool -- cgit v1.2.3