Merge pull request #489 from Nick007J/master

1.1 patch stuff + flying controls
This commit is contained in:
Nikolay Korolev
2020-04-27 00:53:54 +03:00
committed by GitHub
23 changed files with 440 additions and 52 deletions

View File

@ -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);