diff options
| author | aap <aap@papnet.eu> | 2019-07-14 10:22:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-14 10:22:52 +0200 |
| commit | c6afa42f9b9c874fe737810238e52994a46304be (patch) | |
| tree | 5e9a73c0b2872ab71da0f01910aeb415f02ad406 /src/core/Frontend.h | |
| parent | Merge pull request #135 from Nick007J/master (diff) | |
| parent | Frontend fixes. (diff) | |
| download | re3-c6afa42f9b9c874fe737810238e52994a46304be.tar re3-c6afa42f9b9c874fe737810238e52994a46304be.tar.gz re3-c6afa42f9b9c874fe737810238e52994a46304be.tar.bz2 re3-c6afa42f9b9c874fe737810238e52994a46304be.tar.lz re3-c6afa42f9b9c874fe737810238e52994a46304be.tar.xz re3-c6afa42f9b9c874fe737810238e52994a46304be.tar.zst re3-c6afa42f9b9c874fe737810238e52994a46304be.zip | |
Diffstat (limited to 'src/core/Frontend.h')
| -rw-r--r-- | src/core/Frontend.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 9a3cdd50..8b02b866 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -328,7 +328,7 @@ enum eCheckHover HOVEROPTION_19, HOVEROPTION_20, HOVEROPTION_CHANGESKIN, - HOVEROPTION_NULL = 42, + HOVEROPTION_42 = 42, }; enum eMenuColumns @@ -413,10 +413,10 @@ public: tSkinInfo *m_pSelectedSkin; tSkinInfo *field_438; float field_43C; - int field_440; + int m_nCurrExSize; int m_nSkinsTotal; char _unk0[4]; - int field_44C; + int m_nCurrExOption; bool m_bSkinsFound; bool m_bQuitGameNoCD; char field_452; @@ -439,7 +439,7 @@ public: int field_530; char field_534; char field_535; - int8 field_536; + int8 m_nCurrExLayer; int m_nHelperTextAlpha; int m_nMouseOldPosX; int m_nMouseOldPosY; @@ -452,6 +452,7 @@ public: int m_nCurrSaveSlot; int m_nScreenChangeDelayTimer; +public: static int32 &OS_Language; static int8 &m_PrefsUseVibration; static int8 &m_DisplayControllerOnFoot; @@ -516,17 +517,16 @@ public: void SaveSettings(); void SetHelperText(int text); void ShutdownJustMenu(); - static float StretchX(float); - static float StretchY(float); + float StretchX(float); + float StretchY(float); void SwitchMenuOnAndOff(); void UnloadTextures(); void WaitForUserCD(); // New content: uint8 GetNumberOfMenuOptions(); - void SwitchToNewScreen(int8 screen); - void SetDefaultPreferences(int8 screen); - + void SwitchToNewScreen(int32 screen); + void SetDefaultPreferences(int32 screen); }; static_assert(sizeof(CMenuManager) == 0x564, "CMenuManager: error"); |