diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-05-24 01:59:30 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-24 02:05:48 +0200 |
| commit | 4870d9a31be6302037eb7ddcf0b99ea25ebccabc (patch) | |
| tree | 51090b47226f961387b2aa5969b133d23d9b4f5e /src/core/Camera.cpp | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar.gz re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar.bz2 re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar.lz re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar.xz re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.tar.zst re3-4870d9a31be6302037eb7ddcf0b99ea25ebccabc.zip | |
Diffstat (limited to 'src/core/Camera.cpp')
| -rw-r--r-- | src/core/Camera.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 486c2c9e..3b7bdbaf 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -3117,15 +3117,6 @@ CCamera::Fade(float timeout, int16 direction) m_iMusicFadingDirection = direction; m_fTimeToFadeMusic = timeout; m_uiFadeTimeStartedMusic = CTimer::GetTimeInMilliseconds(); -// Not on PS2 - if(!m_bJustJumpedOutOf1stPersonBecauseOfTarget && m_iMusicFadingDirection == FADE_OUT){ - unknown++; - if(unknown >= 2){ - m_bJustJumpedOutOf1stPersonBecauseOfTarget = true; - unknown = 0; - }else - m_bMoveCamToAvoidGeom = true; - } } } @@ -3314,8 +3305,9 @@ CCamera::CalculateDerivedValues(void) // left plane m_vecFrustumNormals[1] = CVector(-c, -s, 0.0f); - c /= CDraw::FindAspectRatio(); - s /= CDraw::FindAspectRatio(); + CDraw::CalculateAspectRatio(); + c /= SCREEN_ASPECT_RATIO; + s /= SCREEN_ASPECT_RATIO; // bottom plane m_vecFrustumNormals[2] = CVector(0.0f, -s, -c); // top plane |