diff options
author | aap <aap@papnet.eu> | 2020-05-24 10:47:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-24 10:47:17 +0200 |
commit | 19a0c8b462a6aa6858f8447b171b53a80106ea22 (patch) | |
tree | 40ac418dc725d9d17fd22d7b445029977e0ef7c5 /src/core/Camera.cpp | |
parent | Merge pull request #582 from Nick007J/miami (diff) | |
parent | Menu borders and weapon fixes (diff) | |
download | re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.gz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.bz2 re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.lz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.xz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.zst re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.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 |