diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
| commit | d0f5464200be032ee464218cfe415f3ce0b119a7 (patch) | |
| tree | dd6f068286bb29c72192689bf741c43fcb505ae1 /src/core/main.cpp | |
| parent | Merge pull request #654 from erorcun/miami (diff) | |
| parent | Rename LEVEL_NONE to LEVEL_GENERIC (diff) | |
| download | re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.gz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.bz2 re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.lz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.xz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.zst re3-d0f5464200be032ee464218cfe415f3ce0b119a7.zip | |
Diffstat (limited to 'src/core/main.cpp')
| -rw-r--r-- | src/core/main.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp index 6e6092f3..7d8bdb5e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -249,7 +249,11 @@ DoFade(void) } // This is CCamera::GetScreenRect in VC - if(TheCamera.m_WideScreenOn){ + if(TheCamera.m_WideScreenOn +#ifdef CUTSCENE_BORDERS_SWITCH + && CMenuManager::m_PrefsCutsceneBorders +#endif + ){ float y = SCREEN_HEIGHT/2 * TheCamera.m_ScreenReductionPercentage/100.0f; rect.left = 0.0f; rect.right = SCREEN_WIDTH; @@ -464,6 +468,11 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen) { CSprite2d *splash; +#ifdef DISABLE_LOADING_SCREEN + if (str1 && str2) + return; +#endif + #ifndef RANDOMSPLASH splashscreen = "LOADSC0"; #endif @@ -885,7 +894,11 @@ Render2dStuff(void) CReplay::Display(); CPickups::RenderPickUpText(); - if(TheCamera.m_WideScreenOn) + if(TheCamera.m_WideScreenOn +#ifdef CUTSCENE_BORDERS_SWITCH + && CMenuManager::m_PrefsCutsceneBorders +#endif + ) TheCamera.DrawBordersForWideScreen(); CPed *player = FindPlayerPed(); |