summaryrefslogtreecommitdiffstats
path: root/src/Frontend.h
diff options
context:
space:
mode:
authoraap <angelo.papenhoff@gmail.com>2019-07-02 22:05:11 +0200
committerGitHub <noreply@github.com>2019-07-02 22:05:11 +0200
commite8215cf560318fdd77817cea485af50fca827552 (patch)
tree477b9853bea245d9cbdaa8700e02ff980abe79d5 /src/Frontend.h
parentMerge pull request #88 from gennariarmando/master (diff)
downloadre3-e8215cf560318fdd77817cea485af50fca827552.tar
re3-e8215cf560318fdd77817cea485af50fca827552.tar.gz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.bz2
re3-e8215cf560318fdd77817cea485af50fca827552.tar.lz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.xz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.zst
re3-e8215cf560318fdd77817cea485af50fca827552.zip
Diffstat (limited to 'src/Frontend.h')
-rw-r--r--src/Frontend.h21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/Frontend.h b/src/Frontend.h
index a833254a..dd6464b8 100644
--- a/src/Frontend.h
+++ b/src/Frontend.h
@@ -29,11 +29,7 @@
#define MENUSELECT_BOX_MAX 20.5f
#define MENUSELECT_BOX_MIN 17.0f
-#ifndef MID_RADIOICONS
#define MENURADIO_ICON_X 31.5f
-#else
-#define MENURADIO_ICON_X -262.0f
-#endif
#define MENURADIO_ICON_Y 29.5f
#define MENURADIO_ICON_W 60.0f
#define MENURADIO_ICON_H 60.0f
@@ -43,8 +39,6 @@
#define MENUSLIDER_X 306.0f
-#define buf(a) (char*)(a)
-
enum eLanguages
{
LANGUAGE_AMERICAN,
@@ -320,7 +314,6 @@ enum eMenuColumns
enum eMenuRow
{
- MENUROW_NONE = -1,
MENUROW_0,
MENUROW_1,
MENUROW_2,
@@ -354,8 +347,7 @@ struct tSkinInfo
struct CMenuScreen
{
char m_ScreenName[8];
- int32 unk;
- int32 m_PreviousPage[2]; // eMenuScreen
+ int32 m_PreviousPage[3]; // eMenuScreen
int32 m_ParentEntry[2]; // eMenuRow
struct CMenuEntry
@@ -425,7 +417,7 @@ public:
int m_nHoverOption;
int m_nCurrScreen;
int m_nCurrOption;
- int m_nPrevOption;
+ int m_nCurrentInput;
int m_nPrevScreen;
int field_558;
int m_nCurrSaveSlot;
@@ -451,8 +443,6 @@ public:
static int8 &m_bFrontEnd_ReloadObrTxtGxt;
static int32 &m_PrefsMusicVolume;
static int32 &m_PrefsSfxVolume;
- static uint8 *m_PrefsSkinFile;
-
static bool &m_bStartUpFrontEndRequested;
static bool &m_bShutDownFrontEndRequested;
static bool &m_PrefsAllowNastyGame;
@@ -462,7 +452,6 @@ public:
static void CentreMousePointer();
void CheckCodesForControls(int, int);
bool CheckHover(int x1, int x2, int y1, int y2);
- void CheckSliderMovement(int);
int CostructStatLine(int);
void DisplayHelperText();
float DisplaySlider(float, float, float, float, float, float);
@@ -500,12 +489,6 @@ public:
void SwitchMenuOnAndOff();
void UnloadTextures();
void WaitForUserCD();
-
- // New content:
- uint8 GetNumberOfMenuOptions();
- void SwitchToNewScreen(int8 screen);
- void SetDefaultPreferences(int8 screen);
-
};
static_assert(sizeof(CMenuManager) == 0x564, "CMenuManager: error");