diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-26 13:27:54 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-26 13:27:54 +0200 |
| commit | d4ba7c387b2f471232d8cabc5f83b2801b4e85b3 (patch) | |
| tree | 5e973f13ba481c1fb92158b1a707dba894a98bf5 /src | |
| parent | Fixes (diff) | |
| parent | fix screenshot name space (diff) | |
| download | re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar.gz re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar.bz2 re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar.lz re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar.xz re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.tar.zst re3-d4ba7c387b2f471232d8cabc5f83b2801b4e85b3.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 6 | ||||
| -rw-r--r-- | src/core/config.h | 3 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10b40be2..9cce6641 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,6 +50,7 @@ if(LIBRW_PLATFORM_D3D9) endif() target_compile_definitions(${EXECUTABLE} PRIVATE CMAKE_BUILD) +target_compile_definitions(${EXECUTABLE} PRIVATE USE_OUR_VERSIONING) if(${PROJECT}_AUDIO STREQUAL "OAL") find_package(OpenAL REQUIRED) diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 9f78d483..3bf05836 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -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; diff --git a/src/core/config.h b/src/core/config.h index 3c5f6ba8..f94384cf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -195,7 +195,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 diff --git a/src/core/main.cpp b/src/core/main.cpp index 9d540635..8e53901f 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -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 |