diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-08 08:58:08 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-08 08:58:08 +0200 |
| commit | 560fc655388ac8cc017b4127e9444fc8702ffd45 (patch) | |
| tree | 4863fe0fa4ab5f837d95085706b5a27e2c567e54 /src/core/Cam.cpp | |
| parent | Merge pull request #386 from erorcun/erorcun (diff) | |
| download | re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar.gz re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar.bz2 re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar.lz re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar.xz re3-560fc655388ac8cc017b4127e9444fc8702ffd45.tar.zst re3-560fc655388ac8cc017b4127e9444fc8702ffd45.zip | |
Diffstat (limited to 'src/core/Cam.cpp')
| -rw-r--r-- | src/core/Cam.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 5b7a53e9..dc9ef74f 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -4672,15 +4672,15 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, else { switch ((int)TheCamera.CarZoomIndicator) { // near - case 1: + case CAM_ZOOM_1: zoomModeAlphaOffset = ZmOneAlphaOffsetLCS[alphaArrPos]; break; // mid - case 2: + case CAM_ZOOM_2: zoomModeAlphaOffset = ZmTwoAlphaOffsetLCS[alphaArrPos]; break; // far - case 3: + case CAM_ZOOM_3: zoomModeAlphaOffset = ZmThreeAlphaOffsetLCS[alphaArrPos]; break; default: @@ -4705,14 +4705,12 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, } } else { // 0.6f = fTestShiftHeliCamTarget - TargetCoors.x += 0.6f * car->GetUp().x * colMaxZ; - TargetCoors.y += 0.6f * car->GetUp().y * colMaxZ; - TargetCoors.z += 0.6f * car->GetUp().z * colMaxZ; + TargetCoors += 0.6f * car->GetUp() * colMaxZ; } float minDistForVehType = CARCAM_SET[camSetArrPos][4]; - if ((int)TheCamera.CarZoomIndicator == 1 && (camSetArrPos < 2 || camSetArrPos == 7)) { + if (TheCamera.CarZoomIndicator == CAM_ZOOM_1 && (camSetArrPos < 2 || camSetArrPos == 7)) { minDistForVehType = minDistForVehType * 0.65f; } @@ -4904,8 +4902,8 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, // yMovement = 0.0; if (!nextDirectionIsForward) { - yMovement = 0.0; - xMovement = 0.0; + yMovement = 0.0f; + xMovement = 0.0f; } if (camSetArrPos == 0 || camSetArrPos == 7) { |