summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-28 12:08:21 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-28 12:08:21 +0200
commita61736c51b3712d78cdf76afe466eb48b2be5227 (patch)
tree8c36cc713ef9ab4472cbe4fa52e8736dee2b3746 /src
parentDetect R and start game on menu (diff)
downloadre3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar.gz
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar.bz2
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar.lz
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar.xz
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.tar.zst
re3-a61736c51b3712d78cdf76afe466eb48b2be5227.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Frontend.cpp12
-rw-r--r--src/core/Frontend.h12
-rw-r--r--src/core/MenuScreens.cpp2
3 files changed, 14 insertions, 12 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index cdacc0a4..fc3a05d9 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -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
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index aa2b92f5..9a364b71 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -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();
};
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
index be914c09..4ced8c0b 100644
--- a/src/core/MenuScreens.cpp
+++ b/src/core/MenuScreens.cpp
@@ -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, },