theoretically fix linux build

This commit is contained in:
eray orçunus 2020-05-28 13:08:21 +03:00
parent e6401bce18
commit a61736c51b
3 changed files with 14 additions and 12 deletions

View File

@ -315,7 +315,7 @@ ScaleAndCenterX(float x)
// --- Functions not in the game/inlined starts
inline void
void
CMenuManager::ScrollUpListByOne()
{
if (m_nSelectedListRow == m_nFirstVisibleRowOnList) {
@ -329,7 +329,7 @@ CMenuManager::ScrollUpListByOne()
}
}
inline void
void
CMenuManager::ScrollDownListByOne()
{
if (m_nSelectedListRow == m_nFirstVisibleRowOnList + MAX_VISIBLE_LIST_ROW - 1) {
@ -345,7 +345,7 @@ CMenuManager::ScrollDownListByOne()
}
}
inline void
void
CMenuManager::PageUpList(bool playSoundOnSuccess)
{
if (m_nTotalListRow > MAX_VISIBLE_LIST_ROW) {
@ -363,7 +363,7 @@ CMenuManager::PageUpList(bool playSoundOnSuccess)
}
}
inline void
void
CMenuManager::PageDownList(bool playSoundOnSuccess)
{
if (m_nTotalListRow > MAX_VISIBLE_LIST_ROW) {
@ -381,7 +381,7 @@ CMenuManager::PageDownList(bool playSoundOnSuccess)
}
}
inline void
void
CMenuManager::ThingsToDoBeforeGoingBack()
{
if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) && strcmp(m_aSkinName, m_PrefsSkinFile) != 0) {
@ -419,7 +419,7 @@ CMenuManager::ThingsToDoBeforeGoingBack()
#endif
}
inline int8
int8
CMenuManager::GetPreviousPageOption()
{
#ifndef CUSTOM_FRONTEND_OPTIONS

View File

@ -647,12 +647,12 @@ public:
int ConstructStatLine(int);
// New (inlined ones and the ones we can't believe it's not inlined)
void ThingsToDoBeforeGoingBack();
void ScrollUpListByOne();
void ScrollDownListByOne();
void PageUpList(bool);
void PageDownList(bool);
int8 GetPreviousPageOption();
inline void ThingsToDoBeforeGoingBack();
inline void ScrollUpListByOne();
inline void ScrollDownListByOne();
inline void PageUpList(bool);
inline void PageDownList(bool);
inline int8 GetPreviousPageOption();
// uint8 GetNumberOfMenuOptions();
};

View File

@ -1,6 +1,8 @@
#include "common.h"
#include "Frontend.h"
// If you want to add new options, please don't do that here and see CustomFrontendOptionsPopulate in re3.cpp.
CMenuScreen aScreens[] = {
// MENUPAGE_NONE = 0
{ "", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0, },