diff options
author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-03 16:30:50 +0100 |
---|---|---|
committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-03 16:30:50 +0100 |
commit | ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a (patch) | |
tree | cdf24283bd03da02b90e3c802c1e88579e274fb2 /src/core/Frontend.cpp | |
parent | Ped: PlayerPed: sync with master (diff) | |
download | re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar.gz re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar.bz2 re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar.lz re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar.xz re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.tar.zst re3-ee05c7fe427f473e1f5cf5e6a728bbaf4fc9218a.zip |
Diffstat (limited to 'src/core/Frontend.cpp')
-rw-r--r-- | src/core/Frontend.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 4c963a13..2a87c7ad 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -1564,6 +1564,7 @@ CMenuManager::Draw() CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[i]; if (option.m_Action == MENUACTION_CFO_SELECT) { + isOptionDisabled = option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded; if (option.m_CFOSelect->onlyApplyOnEnter){ if (m_nCurrOption != i) { if (option.m_CFOSelect->displayedValue != option.m_CFOSelect->lastSavedValue) @@ -5081,6 +5082,9 @@ CMenuManager::ProcessButtonPresses(void) case MENUACTION_CFO_DYNAMIC: CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption]; if (option.m_Action == MENUACTION_CFO_SELECT) { + if (option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded) + break; + if (!option.m_CFOSelect->onlyApplyOnEnter) { option.m_CFOSelect->displayedValue++; if (option.m_CFOSelect->displayedValue >= option.m_CFOSelect->numRightTexts || option.m_CFOSelect->displayedValue < 0) @@ -5307,6 +5311,9 @@ CMenuManager::ProcessButtonPresses(void) case MENUACTION_CFO_DYNAMIC: CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption]; if (option.m_Action == MENUACTION_CFO_SELECT) { + if (option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded) + break; + if (changeValueBy > 0) { option.m_CFOSelect->displayedValue++; if (option.m_CFOSelect->displayedValue >= option.m_CFOSelect->numRightTexts) |