Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

remove inlining attempts + reload frontend options for real

Browse Source
This commit is contained in:
eray orçunus 2020-05-28 13:39:08 +03:00
parent a61736c51b
commit 9acf27fc53
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/Frontend.h
View File

@ -646,13 +646,14 @@ public:
int GetNumOptionsCntrlConfigScreens(); int GetNumOptionsCntrlConfigScreens();
int ConstructStatLine(int); int ConstructStatLine(int);
// New (inlined ones and the ones we can't believe it's not inlined) // Those are either inlined in game, not in function yet, or I can't believe that they're not inlined.
inline void ThingsToDoBeforeGoingBack(); // Names were made up by me.
inline void ScrollUpListByOne(); void ThingsToDoBeforeGoingBack();
inline void ScrollDownListByOne(); void ScrollUpListByOne();
inline void PageUpList(bool); void ScrollDownListByOne();
inline void PageDownList(bool); void PageUpList(bool);
inline int8 GetPreviousPageOption(); void PageDownList(bool);
int8 GetPreviousPageOption();
// uint8 GetNumberOfMenuOptions(); // uint8 GetNumberOfMenuOptions();
}; };

9
src/extras/frontendoption.cpp
View File

@ -50,8 +50,13 @@ RemoveCustomFrontendOptions()
for (int i = 0; i < MENUPAGES; i++) { for (int i = 0; i < MENUPAGES; i++) {
for (int j = 0; j < NUM_MENUROWS; j++) { for (int j = 0; j < NUM_MENUROWS; j++) {
if (aScreens[i].m_aEntries[j].m_Action == MENUACTION_TRIGGERFUNC) { if (aScreens[i].m_aEntries[j].m_Action == MENUACTION_TRIGGERFUNC) {
aScreens[i].m_aEntries[j].m_Action = MENUACTION_NOTHING; int k;
aScreens[i].m_aEntries[j].m_EntryName[0] = '\0'; for (k = j; k < NUM_MENUROWS-1; k++) {
memcpy(&aScreens[i].m_aEntries[k], &aScreens[i].m_aEntries[k+1], sizeof(CMenuScreen::CMenuEntry));
}
aScreens[i].m_aEntries[k].m_Action = MENUACTION_NOTHING;
aScreens[i].m_aEntries[k].m_EntryName[0] = '\0';
j--;
} }
} }
} }