summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:10 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:10 +0200
commit9e65eb34ec834de082154ee7559cd1c418f02ae6 (patch)
treec0c12ec094feb67e7ad98c5e8d48440b37035421 /src/core/Frontend.cpp
parentmissing ifded (diff)
downloadre3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.gz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.bz2
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.lz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.xz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.zst
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.zip
Diffstat (limited to 'src/core/Frontend.cpp')
-rw-r--r--src/core/Frontend.cpp23
1 files changed, 22 insertions, 1 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6fe06d96..0a2903b7 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2954,8 +2954,10 @@ CMenuManager::LoadAllTextures()
CTxdStore::LoadTxd(frontendTxdSlot, "MODELS/FRONTEND.TXD");
CTxdStore::AddRef(frontendTxdSlot);
CTxdStore::SetCurrentTxd(frontendTxdSlot);
+#ifndef GTA3_1_1_PATCH
CStreaming::IHaveUsedStreamingMemory();
CTimer::Update();
+#endif
for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); i++) {
m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
@@ -2982,6 +2984,10 @@ CMenuManager::LoadAllTextures()
m_aMapSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
}
#endif
+#ifdef GTA3_1_1_PATCH
+ CStreaming::IHaveUsedStreamingMemory();
+ CTimer::Update();
+#endif
m_bSpritesLoaded = true;
CTxdStore::PopCurrentTxd();
}
@@ -2993,7 +2999,11 @@ CMenuManager::LoadSettings()
int fileHandle = CFileMgr::OpenFile("gta3.set", "r");
int32 prevLang = m_PrefsLanguage;
+#ifdef GTA3_1_1_PATCH
+ CMBlur::BlurOn = (_dwOperatingSystemVersion != OS_WIN98);
+#else
CMBlur::BlurOn = true;
+#endif
MousePointerStateHelper.bInvertVertically = true;
// 50 is silly
@@ -4456,7 +4466,18 @@ CMenuManager::ProcessButtonPresses(void)
m_PrefsUseWideScreen = false;
m_PrefsShowSubtitles = true;
m_nDisplayVideoMode = m_nPrefsVideoMode;
+#ifdef GTA3_1_1_PATCH
+ if (_dwOperatingSystemVersion == OS_WIN98) {
+ CMBlur::BlurOn = false;
+ CMBlur::MotionBlurClose();
+ }
+ else {
+ CMBlur::BlurOn = true;
+ CMBlur::MotionBlurOpen(Scene.camera);
+ }
+#else
CMBlur::BlurOn = true;
+#endif
SaveSettings();
} else if ((m_nCurrScreen != MENUPAGE_SKIN_SELECT_OLD) && (m_nCurrScreen == MENUPAGE_CONTROLLER_PC)) {
ControlsManager.MakeControllerActionsBlank();
@@ -4986,7 +5007,7 @@ CMenuManager::WaitForUserCD()
CSprite2d *splash;
char *splashscreen = nil;
-#ifndef RANDOMSPLASH
+#if (!(defined RANDOMSPLASH) && !(defined GTA3_1_1_PATCH))
if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
splashscreen = "mainsc2";
else