mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-25 06:06:06 +00:00
Code Issues Projects Releases Wiki Activity

theoretically fix linux build

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/Frontend.cpp
View file

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

12
src/core/Frontend.h
View file

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

2
src/core/MenuScreens.cpp
View file

@ -1,6 +1,8 @@
#include "common.h" #include "common.h"
#include "Frontend.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[] = { CMenuScreen aScreens[] = {
// MENUPAGE_NONE = 0 // MENUPAGE_NONE = 0
{ "", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0, }, { "", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0, },