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/render/Draw.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/render/Draw.cpp')
| -rw-r--r-- | src/render/Draw.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp index b31cc624..e2dfc8d9 100644 --- a/src/render/Draw.cpp +++ b/src/render/Draw.cpp @@ -19,24 +19,23 @@ uint8 CDraw::FadeGreen; uint8 CDraw::FadeBlue; float -CDraw::FindAspectRatio(void) +CDraw::CalculateAspectRatio(void) { -#ifndef ASPECT_RATIO_SCALE - if(FrontEndMenuManager.m_PrefsUseWideScreen) - return 16.0f/9.0f; - else - return 4.0f/3.0f; + if (FrontEndMenuManager.m_PrefsUseWideScreen) { + if (TheCamera.m_WideScreenOn) + CDraw::ms_fAspectRatio = 5.f / 3.f; // It's used on theatrical showings according to Wiki + else +#ifdef ASPECT_RATIO_SCALE + CDraw::ms_fAspectRatio = FrontEndMenuManager.m_PrefsUseWideScreen == AR_AUTO ? SCREEN_WIDTH / SCREEN_HEIGHT : 16.f / 9.f; #else - switch (FrontEndMenuManager.m_PrefsUseWideScreen) { - case AR_AUTO: - return SCREEN_WIDTH / SCREEN_HEIGHT; - default: - case AR_4_3: - return 4.0f / 3.0f; - case AR_16_9: - return 16.0f / 9.0f; - }; + CDraw::ms_fAspectRatio = 16.f / 9.f; #endif + } else if (TheCamera.m_WideScreenOn) { + CDraw::ms_fAspectRatio = 5.f/4.f; + } else { + CDraw::ms_fAspectRatio = 4.f/3.f; + } + return CDraw::ms_fAspectRatio; } #ifdef ASPECT_RATIO_SCALE |