summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-12-27 21:46:15 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-12-27 21:56:36 +0100
commit38a1fef5c1e22c58ae4dd316800a162b04e22aad (patch)
treee9a2be5e67816921ce2edc869e03932e61d07e92 /src
parentDynamically add pipelines options, only if neo.txd exists (diff)
downloadre3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar.gz
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar.bz2
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar.lz
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar.xz
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.tar.zst
re3-38a1fef5c1e22c58ae4dd316800a162b04e22aad.zip
Diffstat (limited to '')
-rw-r--r--src/core/Frontend.cpp8
-rw-r--r--src/core/Game.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 72739f7b..13fb1add 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3744,13 +3744,7 @@ CMenuManager::LoadSettings()
strcpy(m_PrefsSkinFile, DEFAULT_SKIN_NAME);
strcpy(m_aSkinName, DEFAULT_SKIN_NAME);
}
-
-#ifdef CUSTOM_FRONTEND_OPTIONS
- // Apparently this func. can be run multiple times at the start.
- if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) {
- CustomFrontendOptionsPopulate();
- }
-#endif
+
#ifdef LOAD_INI_SETTINGS
LoadINISettings(); // needs frontend options to be loaded
#endif
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 126f0341..ff87b95a 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -32,6 +32,7 @@
#include "Fluff.h"
#include "Font.h"
#include "Frontend.h"
+#include "frontendoption.h"
#include "GameLogic.h"
#include "Garages.h"
#include "GenericGameStorage.h"
@@ -168,6 +169,11 @@ CGame::InitialiseOnceBeforeRW(void)
#ifdef EXTENDED_COLOURFILTER
CPostFX::InitOnce();
#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+ // Not needed here but may be needed in future
+ // if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0)
+ CustomFrontendOptionsPopulate();
+#endif
return true;
}