Merge branch 'lcs-dev' into lcs

This commit is contained in:
Nikolay Korolev
2021-01-20 12:12:56 +03:00
9 changed files with 27 additions and 20 deletions

View File

@ -3369,9 +3369,9 @@ CMenuManager::Process(void)
#ifdef XBOX_MESSAGE_SCREEN
ProcessDialogTimer();
#endif
if (TheCamera.GetScreenFadeStatus() != FADE_0)
return;
// tmp hack to get saving to work
//if (TheCamera.GetScreenFadeStatus() != FADE_0)
// return;
InitialiseChangedLanguageSettings();

View File

@ -212,7 +212,7 @@ enum Config {
# define PS2_MATFX
# endif
# define PC_PLAYER_CONTROLS // mouse player/cam mode
# //define GTA_REPLAY
//# define GTA_REPLAY
# define GTA_SCENE_EDIT
#elif defined GTA_XBOX
#endif