summaryrefslogtreecommitdiffstats
path: root/src/core/Game.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-10-05 15:10:26 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-10-05 15:10:26 +0200
commit6853be36c8bd293c8ee0b18cd411fc5a3ebe1099 (patch)
tree813ff9d66382eea57625ec5cb2ca1872d12d7113 /src/core/Game.cpp
parentfixed darkel/replay (diff)
parentMerge branch 'master' of https://github.com/GTAmodding/re3 into audioFix (diff)
downloadre3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar.gz
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar.bz2
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar.lz
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar.xz
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.tar.zst
re3-6853be36c8bd293c8ee0b18cd411fc5a3ebe1099.zip
Diffstat (limited to 'src/core/Game.cpp')
-rw-r--r--src/core/Game.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index e944512a..93f0d1b0 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -295,11 +295,15 @@ bool CGame::InitialiseOnceAfterRW(void)
CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
#ifdef CUSTOM_FRONTEND_OPTIONS
+ // Apparently this func. can be run multiple times at the start.
if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) {
+ // needs stored language and TheText to be loaded, and last TheText reload is at the start of here
CustomFrontendOptionsPopulate();
- FrontEndMenuManager.LoadSettings();
}
#endif
+#ifdef LOAD_INI_SETTINGS
+ LoadINISettings(); // needs frontend options to be loaded
+#endif
return true;
}