summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-05 16:14:01 +0200
committerGitHub <noreply@github.com>2020-05-05 16:14:01 +0200
commitfcd386f55d54b84a22540c106ba53f60b7c9b5f5 (patch)
tree4263c1f88eb693268e4b75104a5b2430b6dff580 /src/core/Camera.cpp
parentfixed traffic lights (diff)
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
downloadre3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar.gz
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar.bz2
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar.lz
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar.xz
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.tar.zst
re3-fcd386f55d54b84a22540c106ba53f60b7c9b5f5.zip
Diffstat (limited to 'src/core/Camera.cpp')
-rw-r--r--src/core/Camera.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 3f4684e7..830a2bb2 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -934,11 +934,13 @@ CCamera::CamControl(void)
if(CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer())
stairs = true;
// Some hack for Mr Whoopee in a bomb shop
+#ifndef MIAMI // uhh, check this
if(Cams[ActiveCam].Using3rdPersonMouseCam() && CCollision::ms_collisionInMemory == LEVEL_COMMERCIAL){
if(pTargetEntity->GetPosition().x < 83.0f && pTargetEntity->GetPosition().x > 18.0f &&
pTargetEntity->GetPosition().y < -305.0f && pTargetEntity->GetPosition().y > -390.0f)
disableGarageCam = true;
}
+#endif
if(!disableGarageCam && (CGarages::IsPointInAGarageCameraZone(pTargetEntity->GetPosition()) || stairs)){
if(!m_bGarageFixedCamPositionSet && m_bLookingAtPlayer){
if(pToGarageWeAreIn || stairs){