summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-29 19:29:18 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-29 19:29:18 +0200
commit9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c (patch)
treee06549e071ececbc1c340f0c413378a427390027 /src
parentremove inlining attempts + reload frontend options for real (diff)
downloadre3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar.gz
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar.bz2
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar.lz
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar.xz
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.tar.zst
re3-9adde91b3a22d15d5e83f94cc9f0b5a9aa4b6b2c.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Frontend.cpp28
-rw-r--r--src/extras/frontendoption.h3
2 files changed, 22 insertions, 9 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index fc3a05d9..5350cb02 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -412,6 +412,9 @@ CMenuManager::ThingsToDoBeforeGoingBack()
if (option.returnPrevPageFunc)
option.returnPrevPageFunc();
+ if (option.type == FEOPTION_DYNAMIC)
+ option.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+
if (option.onlyApplyOnEnter)
option.displayedValue = *option.value;
}
@@ -1205,8 +1208,7 @@ CMenuManager::Draw()
} else if (option.type == FEOPTION_DYNAMIC) {
if (option.drawFunc) {
- option.drawFunc(unicodeTemp, &isOptionDisabled);
- rightText = unicodeTemp;
+ rightText = option.drawFunc(&isOptionDisabled);
}
}
} else
@@ -1291,14 +1293,15 @@ CMenuManager::Draw()
if (!CFont::Details.centre)
CFont::SetRightJustifyOn();
- if(!strcmp(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName, "FED_RES")
- && !m_bGameNotLoaded && textLayer == 1
+ if(textLayer == 1)
+ if(!strcmp(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName, "FED_RES")
+ && !m_bGameNotLoaded
#ifdef CUSTOM_FRONTEND_OPTIONS
- || isOptionDisabled
+ || isOptionDisabled
#endif
- ) {
- CFont::SetColor(CRGBA(155, 117, 6, FadeIn(255)));
- }
+ )
+ CFont::SetColor(CRGBA(155, 117, 6, FadeIn(255)));
+
CFont::PrintString(MENU_X_RIGHT_ALIGNED(columnWidth - textLayer), itemY, rightText);
}
if (i == m_nCurrOption && itemsAreSelectable){
@@ -1345,6 +1348,7 @@ CMenuManager::Draw()
FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
if (option.onlyApplyOnEnter && m_nCurrOption != i)
option.displayedValue = *option.value;
+
}
#endif
@@ -4318,6 +4322,7 @@ CMenuManager::ProcessButtonPresses(void)
}
#endif
+ int prevOption = m_nCurrOption;
if (goDown && (m_nCurrScreen != MENUPAGE_MULTIPLAYER_FIND_GAME)) {
m_nCurrOption++;
if (m_nCurrOption == NUM_MENUROWS || (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_NOTHING)) {
@@ -4334,6 +4339,13 @@ CMenuManager::ProcessButtonPresses(void)
m_nCurrOption--;
}
}
+#ifdef CUSTOM_FRONTEND_OPTIONS
+ if (m_nCurrOption != prevOption && aScreens[m_nCurrScreen].m_aEntries[prevOption].m_Action == MENUACTION_TRIGGERFUNC) {
+ FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[prevOption].m_TargetMenu];
+ if (option.type == FEOPTION_DYNAMIC)
+ option.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+ }
+#endif
if (optionSelected) {
int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
diff --git a/src/extras/frontendoption.h b/src/extras/frontendoption.h
index 6c6ac20c..7cfc09a7 100644
--- a/src/extras/frontendoption.h
+++ b/src/extras/frontendoption.h
@@ -21,6 +21,7 @@
#define FEOPTION_ACTION_LEFT 0
#define FEOPTION_ACTION_RIGHT 1
#define FEOPTION_ACTION_SELECT 2
+#define FEOPTION_ACTION_FOCUSLOSS 3
void RemoveCustomFrontendOptions();
void CustomFrontendOptionsPopulate();
@@ -32,7 +33,7 @@ typedef void (*ReturnPrevPageFunc)();
typedef void (*ChangeFunc)(int8 displayedValue); // called before updating the value
// for dynamic options
-typedef void (*DrawFunc)(wchar* out, bool* disabled); // parameters should be set by user, both is allocated. disabled option will be dark yellow
+typedef wchar* (*DrawFunc)(bool* disabled); // should return pointer to right text. *disabled = true will make it dark yellow
typedef void (*ButtonPressFunc)(int8 action); // see FEOPTION_ACTIONs above
struct FrontendOption