a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 07:40:01 +00:00
Code Issues Projects Releases Wiki Activity

move cfo populate func.

Browse source
This commit is contained in:
erorcun 2020-12-27 23:46:15 +03:00
parent cd24936ca9
commit 38a1fef5c1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/Frontend.cpp
View file

@ -3745,12 +3745,6 @@ CMenuManager::LoadSettings()
strcpy(m_aSkinName, 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 #ifdef LOAD_INI_SETTINGS
LoadINISettings(); // needs frontend options to be loaded LoadINISettings(); // needs frontend options to be loaded
#endif #endif

6
src/core/Game.cpp
View file

@ -32,6 +32,7 @@
#include "Fluff.h" #include "Fluff.h"
#include "Font.h" #include "Font.h"
#include "Frontend.h" #include "Frontend.h"
#include "frontendoption.h"
#include "GameLogic.h" #include "GameLogic.h"
#include "Garages.h" #include "Garages.h"
#include "GenericGameStorage.h" #include "GenericGameStorage.h"
@ -167,6 +168,11 @@ CGame::InitialiseOnceBeforeRW(void)
ValidateVersion(); ValidateVersion();
#ifdef EXTENDED_COLOURFILTER #ifdef EXTENDED_COLOURFILTER
CPostFX::InitOnce(); CPostFX::InitOnce();
#endif
#ifdef CUSTOM_FRONTEND_OPTIONS
// Not needed here but may be needed in future
// if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0)
CustomFrontendOptionsPopulate();
#endif #endif
return true; return true;
} }