summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-06-26 13:34:52 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-06-26 13:34:52 +0200
commit636f67ca3ff8244b8bc7d072256cc664e7d043ac (patch)
tree79f85f3950fa80f84fe9b8d0c908aad2b2d585be /src/core
parentsync (diff)
parentMerge remote-tracking branch 'origin/miami' into lcs (diff)
downloadre3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar.gz
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar.bz2
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar.lz
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar.xz
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.tar.zst
re3-636f67ca3ff8244b8bc7d072256cc664e7d043ac.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp6
-rw-r--r--src/core/config.h3
-rw-r--r--src/core/main.cpp2
3 files changed, 9 insertions, 2 deletions
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 4ed174a9..4a59d298 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -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
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