summaryrefslogtreecommitdiffstats
path: root/src/skel/win
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-26 23:53:54 +0200
committerGitHub <noreply@github.com>2020-04-26 23:53:54 +0200
commit68bf2398689a1de168dce41d31ad2070ce32f70a (patch)
tree9de92b6123fb2b7e219768b5b6e5c11b2ac0b75a /src/skel/win
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.gz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.bz2
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.lz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.xz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.zst
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.zip
Diffstat (limited to 'src/skel/win')
-rw-r--r--src/skel/win/win.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index e623defb..288788c0 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -596,8 +596,9 @@ psInitialise(void)
C_PcSave::SetSaveDirectory(_psGetUserFilesFolder());
InitialiseLanguage();
-
+#ifndef GTA3_1_1_PATCH
FrontEndMenuManager.LoadSettings();
+#endif
gGameState = GS_START_UP;
TRACE("gGameState = GS_START_UP");
@@ -642,7 +643,11 @@ psInitialise(void)
_dwOperatingSystemVersion = OS_WIN95;
}
}
-
+
+#ifdef GTA3_1_1_PATCH
+ FrontEndMenuManager.LoadSettings();
+#endif
+
dwDXVersion = GetDXVersion();
debug("DirectX version 0x%x\n", dwDXVersion);