diff options
| author | majestic <majesticcoding@gmail.com> | 2020-10-02 22:43:29 +0200 |
|---|---|---|
| committer | majestic <majesticcoding@gmail.com> | 2020-10-02 22:43:29 +0200 |
| commit | 3a2be9a4ed7bdf9675ebd7b65fba00304acd1097 (patch) | |
| tree | 15343e953f8f06247b72fb01467d45325a220f79 /src/core/Frontend.h | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| parent | Merge pull request #737 from theR4K/miamiDev (diff) | |
| download | re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar.gz re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar.bz2 re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar.lz re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar.xz re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.tar.zst re3-3a2be9a4ed7bdf9675ebd7b65fba00304acd1097.zip | |
Diffstat (limited to 'src/core/Frontend.h')
| -rw-r--r-- | src/core/Frontend.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 456e9bd0..6cd58e7d 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -5,15 +5,9 @@ #include "Sprite2d.h" -#ifdef PS2_LIKE_MENU -#define MENUHEADER_POS_X 50.0f -#define MENUHEADER_POS_Y 75.0f -#define MENUHEADER_HEIGHT 1.3f -#else #define MENUHEADER_POS_X 10.0f #define MENUHEADER_POS_Y 10.0f #define MENUHEADER_HEIGHT 2.0f -#endif #define MENUHEADER_WIDTH 1.0f #define MENU_UNK_X_MARGIN 10.0f @@ -237,9 +231,6 @@ enum eMenuAction MENUACTION_SETDBGFLAG, MENUACTION_LOADRADIO, MENUACTION_SAVEGAME, - - // Below this is TODO(Miami) - MENUACTION_DRAWDIST, MENUACTION_SWITCHBIGWHITEDEBUGLIGHT, MENUACTION_COLLISIONPOLYS, MENUACTION_LEGENDS, @@ -247,16 +238,11 @@ enum eMenuAction MENUACTION_HUD, MENUACTION_GOBACK, MENUACTION_KEYBOARDCTRLS, - MENUACTION_PARSEHEAP, - // MENUACTION_MEMCARDSAVECONFIRM is that on VC enum?? - MENUACTION_DEBUGSTREAM, MENUACTION_GETKEY, MENUACTION_SHOWHEADBOB, - MENUACTION_UNK80, + MENUACTION_UNK38, // MENUACTION_PARSEHEAP? MENUACTION_DEBUGSTREAM? MENUACTION_MEMCARDSAVECONFIRM? MENUACTION_INVVERT, MENUACTION_CANCELGAME, - MENUACTION_MOUSESENS, - MENUACTION_MP3VOLUMEBOOST, MENUACTION_RESUME, MENUACTION_DONTCANCEL, MENUACTION_SCREENRES, @@ -267,7 +253,9 @@ enum eMenuAction MENUACTION_CTRLMETHOD, MENUACTION_DYNAMICACOUSTIC, MENUACTION_MOUSESTEER, - MENUACTION_UNK110, + MENUACTION_DRAWDIST, + MENUACTION_MOUSESENS, + MENUACTION_MP3VOLUMEBOOST, #ifdef IMPROVED_VIDEOMODE MENUACTION_SCREENFORMAT, #endif @@ -532,7 +520,7 @@ public: CSprite2d m_aFrontEndSprites[NUM_MENU_SPRITES]; bool m_bSpritesLoaded; int32 field_F0; - int32 m_LastRadioScrollDir; + int32 m_ScrollRadioBy; int32 m_nCurrScreen; int32 m_nPrevScreen; int32 m_nCurrSaveSlot; @@ -678,7 +666,8 @@ public: void Process(); void ProcessList(bool &optionSelected, bool &goBack); void UserInput(); - void ProcessButtonPresses(uint8, uint8, uint8, uint8, int8); + void ProcessUserInput(uint8, uint8, uint8, uint8, int8); + void ChangeRadioStation(uint8); void ProcessFileActions(); void ProcessOnOffMenuOptions(); void RequestFrontEndShutDown(); |