summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.h
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-11-07 16:04:01 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-11-07 19:58:23 +0100
commit163c12608fa972e6bed225ac6cb56d0a68279f06 (patch)
treebb08a5b34483101497084a5fbd3f65b920db0d56 /src/core/Frontend.h
parentFix cAudioManager::GetPhrase (diff)
downloadre3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar.gz
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar.bz2
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar.lz
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar.xz
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.tar.zst
re3-163c12608fa972e6bed225ac6cb56d0a68279f06.zip
Diffstat (limited to 'src/core/Frontend.h')
-rw-r--r--src/core/Frontend.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 70b4cd31..fba98690 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -235,11 +235,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 +380,6 @@ enum eMenuAction
// MENUACTION_MIPMAPS,
// MENUACTION_TEXTURE_FILTERING,
//#endif
-//#ifdef NO_ISLAND_LOADING
-// MENUACTION_ISLANDLOADING,
-//#endif
};
enum eCheckHover
@@ -718,7 +715,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)