summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2021-01-31 21:06:38 +0100
committerFilip Gawin <filip.gawin@zoho.com>2021-01-31 21:06:38 +0100
commit3d4791f2915a5b1f38c34a0cf01e0dffc588af8c (patch)
treef6a510c62b8322a11292acafbbc266d1c2c466c2 /src/core/Camera.cpp
parentFirst batch of fixes (CallAndMessage) (diff)
downloadre3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar.gz
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar.bz2
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar.lz
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar.xz
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.tar.zst
re3-3d4791f2915a5b1f38c34a0cf01e0dffc588af8c.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 712e9d09..2ce4e754 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1699,12 +1699,10 @@ CCamera::CamControl(void)
Cams[ActiveCam].CamTargetEntity = pTargetEntity;
// Ped visibility
- if(((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON || Cams[ActiveCam].Mode == CCam::MODE_SNIPER || Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
- Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) &&
-#ifdef FIX_BUGS
- pTargetEntity &&
-#endif
- pTargetEntity->IsPed()) ||
+ if((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+ Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+ Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+ Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) && pTargetEntity->IsPed() ||
Cams[ActiveCam].Mode == CCam::MODE_FLYBY)
FindPlayerPed()->bIsVisible = false;
else
@@ -1756,15 +1754,14 @@ CCamera::UpdateTargetEntity(void)
PLAYER->m_pMyVehicle &&
PLAYER->m_pMyVehicle->CanPedOpenLocks(PLAYER))
cantOpen = false;
-#ifdef FIX_BUGS
- if(PLAYER)
-#endif
- if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen) {
- if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS) {
- pTargetEntity = PLAYER->m_pMyVehicle;
- if(PLAYER->m_pMyVehicle == nil) pTargetEntity = PLAYER;
- }
+
+ if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen){
+ if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS){
+ pTargetEntity = PLAYER->m_pMyVehicle;
+ if(PLAYER->m_pMyVehicle == nil)
+ pTargetEntity = PLAYER;
}
+ }
if((PLAYER->GetPedState() == PED_CARJACK || PLAYER->GetPedState() == PED_OPEN_DOOR) && !cantOpen){
if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS)