summaryrefslogtreecommitdiffstats
path: root/src/core/Game.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-10-04 21:18:33 +0200
committerGitHub <noreply@github.com>2020-10-04 21:18:33 +0200
commitea4007a13c844007b5b5ad06b6e01941cbd66e10 (patch)
tree32195602f9ba72f90ff2dbe4a2a1447f339012e1 /src/core/Game.cpp
parentsmall fix (diff)
parentMerge branch 'master' into master (diff)
downloadre3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.gz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.bz2
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.lz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.xz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.zst
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.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;
}