diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-27 00:53:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 00:53:54 +0300 |
| commit | 68bf2398689a1de168dce41d31ad2070ce32f70a (patch) | |
| tree | 9de92b6123fb2b7e219768b5b6e5c11b2ac0b75a /src/skel | |
| parent | e467cb08b84b747e5c70b319a2d0180a02b50ab7 (diff) | |
| parent | fbca45239d54e9d2caa1dfca4c95947963091c69 (diff) | |
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/win/win.cpp | 9 |
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); |