summaryrefslogtreecommitdiffstats
path: root/src/skel/win/win.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-24 00:01:41 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-24 00:01:41 +0200
commit0b12cacf15baea97414d401eb2684cfc4cec8d0d (patch)
tree0d59b3a90372bb06635edb341861141ebcc92b11 /src/skel/win/win.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.gz
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.bz2
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.lz
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.xz
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.tar.zst
re3-0b12cacf15baea97414d401eb2684cfc4cec8d0d.zip
Diffstat (limited to 'src/skel/win/win.cpp')
-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 d13d3c52..8697c19c 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -594,8 +594,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");
@@ -640,7 +641,11 @@ psInitialise(void)
_dwOperatingSystemVersion = OS_WIN95;
}
}
-
+
+#ifdef GTA3_1_1_PATCH
+ FrontEndMenuManager.LoadSettings();
+#endif
+
dwDXVersion = GetDXVersion();
debug("DirectX version 0x%x\n", dwDXVersion);