diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-27 10:51:24 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-27 10:51:24 +0100 |
commit | 62240606271b80ad5f8cc47f30d6f3f974d1fabe (patch) | |
tree | 0ec36dae8d78c49b21d3cce71c16c9e0da8c74e8 /src/core/Camera.cpp | |
parent | script 600-699 (diff) | |
parent | Merge pull request #259 from Fire-Head/master (diff) | |
download | re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar.gz re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar.bz2 re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar.lz re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar.xz re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.tar.zst re3-62240606271b80ad5f8cc47f30d6f3f974d1fabe.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/Camera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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 |