diff options
| author | withmorten <morten.with@gmail.com> | 2020-11-15 22:08:40 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2020-11-15 22:08:40 +0100 |
| commit | 0669df763c5e50d506ee0a57febe993d53543447 (patch) | |
| tree | 7c4f7457a98dee5d6ebbc10179f4ce6d9f9e95cb /src/core/Frontend.h | |
| parent | revert frontend changes for invertlook4pad (diff) | |
| parent | Make collision code placement more like original (+ small fixes) (diff) | |
| download | re3-0669df763c5e50d506ee0a57febe993d53543447.tar re3-0669df763c5e50d506ee0a57febe993d53543447.tar.gz re3-0669df763c5e50d506ee0a57febe993d53543447.tar.bz2 re3-0669df763c5e50d506ee0a57febe993d53543447.tar.lz re3-0669df763c5e50d506ee0a57febe993d53543447.tar.xz re3-0669df763c5e50d506ee0a57febe993d53543447.tar.zst re3-0669df763c5e50d506ee0a57febe993d53543447.zip | |
Diffstat (limited to 'src/core/Frontend.h')
| -rw-r--r-- | src/core/Frontend.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 70b4cd31..21124fdb 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -18,7 +18,6 @@ #define MENU_X_MARGIN 40.0f #define MENUACTION_POS_Y 60.0f -#define MENUACTION_WIDTH 38.0f #define MENUACTION_SCALE_MULT 0.9f #define MENURADIO_ICON_SCALE 60.0f @@ -235,11 +234,11 @@ enum eMenuScreen MENUPAGE_KEYBOARD_CONTROLS = 55, MENUPAGE_MOUSE_CONTROLS = 56, MENUPAGE_MISSION_RETRY = 57, -#ifdef CUSTOM_FRONTEND_OPTIONS - #ifdef MENU_MAP - MENUPAGE_MAP, + MENUPAGE_MAP = 58, #endif +#ifdef CUSTOM_FRONTEND_OPTIONS + #ifdef GRAPHICS_MENU_OPTIONS MENUPAGE_GRAPHICS_SETTINGS, #else @@ -380,9 +379,6 @@ enum eMenuAction // MENUACTION_MIPMAPS, // MENUACTION_TEXTURE_FILTERING, //#endif -//#ifdef NO_ISLAND_LOADING -// MENUACTION_ISLANDLOADING, -//#endif }; enum eCheckHover @@ -718,7 +714,6 @@ public: ISLAND_LOADING_HIGH }; - static int8 m_DisplayIslandLoading; static int8 m_PrefsIslandLoading; #define ISLAND_LOADING_IS(p) if (CMenuManager::m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_##p) @@ -786,6 +781,7 @@ public: void PageUpList(bool); void PageDownList(bool); int8 GetPreviousPageOption(); + void ProcessList(bool &goBack, bool &optionSelected); }; #ifndef IMPROVED_VIDEOMODE |