diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-11 11:31:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 11:31:13 +0100 |
| commit | 9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9 (patch) | |
| tree | 238dbe95beaf7b48e44fb814389ec71abce943fc /src/core/Frontend.h | |
| parent | Fix crash when falling from bike while shooting (diff) | |
| parent | More fixes (diff) | |
| download | re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar.gz re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar.bz2 re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar.lz re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar.xz re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.tar.zst re3-9d8e32d9b2eb774f82825069e0c05ad47ce1ebe9.zip | |
Diffstat (limited to 'src/core/Frontend.h')
| -rw-r--r-- | src/core/Frontend.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 060b70da..112ea7ad 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 +#ifdef 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 +#ifdef 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 |