summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-11 20:04:35 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-11 20:04:35 +0200
commit8fae2dcc263cd8edeb7d2f55c95369457d6d2ded (patch)
tree71e551e81fa2cce105d65fe95a1972cc0716ea0c /src/core/Camera.cpp
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar.gz
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar.bz2
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar.lz
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar.xz
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.tar.zst
re3-8fae2dcc263cd8edeb7d2f55c95369457d6d2ded.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 73bbd75e..ffaa5884 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -696,8 +696,8 @@ CCamera::CamControl(void)
garageDoorPos2.z = 0.0f;
#endif
}
- garageCenter.x = (pToGarageWeAreIn->m_fX1 + pToGarageWeAreIn->m_fX2)/2.0f;
- garageCenter.y = (pToGarageWeAreIn->m_fY1 + pToGarageWeAreIn->m_fY2)/2.0f;
+ garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+ garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
garageCenter.z = 0.0f;
if(whichDoor == 1)
garageCenterToDoor = garageDoorPos1 - garageCenter;
@@ -979,8 +979,8 @@ CCamera::CamControl(void)
}
if(pToGarageWeAreIn){
- garageCenter.x = (pToGarageWeAreIn->m_fX1 + pToGarageWeAreIn->m_fX2)/2.0f;
- garageCenter.y = (pToGarageWeAreIn->m_fY1 + pToGarageWeAreIn->m_fY2)/2.0f;
+ garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+ garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
garageCenter.z = 0.0f;
}else{
garageDoorPos1.z = 0.0f;
@@ -1013,8 +1013,8 @@ CCamera::CamControl(void)
if(PedZoomIndicator == CAM_ZOOM_TOPDOWN && !stairs){
garageCamPos = garageCenter;
garageCamPos.z += FindPlayerPed()->GetPosition().z + 2.1f;
- if(pToGarageWeAreIn && garageCamPos.z > pToGarageWeAreIn->m_fX2) // What?
- garageCamPos.z = pToGarageWeAreIn->m_fX2;
+ if(pToGarageWeAreIn && garageCamPos.z > pToGarageWeAreIn->m_fSupX) // What?
+ garageCamPos.z = pToGarageWeAreIn->m_fSupX;
}else
garageCamPos.z = ground + 3.1f;
SetCamPositionForFixedMode(garageCamPos, CVector(0.0f, 0.0f, 0.0f));