summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-02-10 07:57:51 +0100
committerSergeanur <s.anureev@yandex.ua>2021-02-10 07:57:51 +0100
commit12330e38cb3c2a023bc1327cb89afd19efed0a43 (patch)
treee1db738c39b18b532ef4fe5ac67d8d0cc25b5064 /src/core/Frontend.h
parentfix (diff)
downloadre3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar.gz
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar.bz2
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar.lz
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar.xz
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.tar.zst
re3-12330e38cb3c2a023bc1327cb89afd19efed0a43.zip
Diffstat (limited to '')
-rw-r--r--src/core/Frontend.h29
1 files changed, 27 insertions, 2 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index c1c3983e..6457ce29 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -137,6 +137,13 @@ enum eMenuSprites
MENUSPRITE_DOWNON,
MENUSPRITE_UPOFF,
MENUSPRITE_UPON,
+#ifdef GAMEPAD_MENU
+ MENUSPRITE_CONTROLLER,
+ MENUSPRITE_ARROWS1,
+ MENUSPRITE_ARROWS2,
+ MENUSPRITE_ARROWS3,
+ MENUSPRITE_ARROWS4,
+#endif
NUM_MENU_SPRITES
};
@@ -192,8 +199,10 @@ enum eMenuScreen
MENUPAGE_MOUSE_CONTROLS = 31,
MENUPAGE_PAUSE_MENU = 32,
MENUPAGE_NONE = 33, // Then chooses main menu or pause menu
-#ifdef LEGACY_MENU_OPTIONS
+#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
MENUPAGE_CONTROLLER_SETTINGS,
+#endif
+#ifdef LEGACY_MENU_OPTIONS
MENUPAGE_DEBUG_MENU,
MENUPAGE_CONTROLLER_PC_OLD1,
MENUPAGE_CONTROLLER_PC_OLD2,
@@ -275,7 +284,7 @@ enum eMenuAction
MENUACTION_DRAWDIST,
MENUACTION_MOUSESENS,
MENUACTION_MP3VOLUMEBOOST,
-#ifdef LEGACY_MENU_OPTIONS
+#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
MENUACTION_CTRLVIBRATION,
MENUACTION_CTRLCONFIG,
#endif
@@ -668,6 +677,18 @@ public:
int8 m_nDisplayMSAALevel;
#endif
+#ifdef GAMEPAD_MENU
+ enum
+ {
+ CONTROLLER_DUALSHOCK2 = 0,
+ CONTROLLER_DUALSHOCK3,
+ CONTROLLER_DUALSHOCK4,
+ CONTROLLER_XBOX360,
+ CONTROLLER_XBOXONE,
+ };
+
+ int8 m_PrefsControllerType;
+#endif
enum LANGUAGE
{
LANGUAGE_AMERICAN,
@@ -788,6 +809,10 @@ public:
int8 GetPreviousPageOption();
// uint8 GetNumberOfMenuOptions();
+#ifdef GAMEPAD_MENU
+ void LoadController(int8 type);
+ void PrintController(void);
+#endif
};
#ifndef IMPROVED_VIDEOMODE