mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-17 13:34:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/lcs' into lcs

Browse source
This commit is contained in:
Nikolay Korolev 2021-06-26 14:34:52 +03:00
commit 636f67ca3f
11 changed files with 16126 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/Frontend.cpp
View file

@ -2919,9 +2919,15 @@ CMenuManager::InitialiseChangedLanguageSettings()
{
if (m_bFrontEnd_ReloadObrTxtGxt) {
m_bFrontEnd_ReloadObrTxtGxt = false;
#ifdef FIX_BUGS
if (gGameState > GS_INIT_ONCE)
#endif
CTimer::Stop();
TheText.Unload();
TheText.Load();
#ifdef FIX_BUGS
if (gGameState > GS_INIT_ONCE)
#endif
CTimer::Update();
CGame::frenchGame = false;
CGame::germanGame = false;

3
src/core/config.h
View file

@ -197,7 +197,8 @@ enum Config {
#define DRAW_GAME_VERSION_TEXT
#ifdef DRAW_GAME_VERSION_TEXT
// unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default.
#define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development
// If you disable this then game will fetch version from peds.col, as R* did while in development.
//#define USE_OUR_VERSIONING // enabled from buildfiles by default
#endif
// Memory allocation and compression

2
src/core/main.cpp
View file

@ -387,7 +387,7 @@ DoRWStuffEndOfFrame(void)
}
#else
if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) {
sprintf(s, "screen_%11lld.png", time(nil));
sprintf(s, "screen_0%11lld.png", time(nil));
RwGrabScreen(Scene.camera, s);
}
#endif