diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-07 22:44:30 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-07 22:44:30 +0200 |
commit | 48e13ce6c93e7fc1cf75abbe082f383d28868cb6 (patch) | |
tree | 45a06cdca80919cf04ff46163e54675b22d39f3a /src/core/Frontend.h | |
parent | weather stuff (diff) | |
parent | Merge pull request #386 from erorcun/erorcun (diff) | |
download | re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar.gz re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar.bz2 re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar.lz re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar.xz re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.tar.zst re3-48e13ce6c93e7fc1cf75abbe082f383d28868cb6.zip |
Diffstat (limited to 'src/core/Frontend.h')
-rw-r--r-- | src/core/Frontend.h | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 4eee198f..a97afb24 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -109,6 +109,8 @@ enum eFrontendSprites FE_RADIO7, FE_RADIO8, FE_RADIO9, + + NUM_FE_SPRITES }; enum eMenuSprites @@ -132,6 +134,8 @@ enum eMenuSprites MENUSPRITE_UPOFF, MENUSPRITE_UPON, MENUSPRITE_GTA3LOGO, + MENUSPRITE_UNUSED, + NUM_MENU_SPRITES }; enum eSaveSlot @@ -149,6 +153,22 @@ enum eSaveSlot SAVESLOT_LABEL = 36 }; +#ifdef MENU_MAP +enum MapSprites +{ + MAPMID1, + MAPMID2, + MAPMID3, + MAPBOT1, + MAPBOT2, + MAPBOT3, + MAPTOP1, + MAPTOP2, + MAPTOP3, + NUM_MAP_SPRITES +}; +#endif + enum eMenuScreen { MENUPAGE_DISABLED = -1, @@ -211,6 +231,9 @@ enum eMenuScreen MENUPAGE_MOUSE_CONTROLS = 56, MENUPAGE_57 = 57, MENUPAGE_58 = 58, +#ifdef MENU_MAP + MENUPAGE_MAP = 59, +#endif MENUPAGES }; @@ -465,8 +488,8 @@ public: char field_455; bool m_bStartWaitingForKeyBind; bool m_bSpritesLoaded; - CSprite2d m_aFrontEndSprites[28]; - CSprite2d m_aMenuSprites[20]; + CSprite2d m_aFrontEndSprites[NUM_FE_SPRITES]; + CSprite2d m_aMenuSprites[NUM_MENU_SPRITES]; int32 field_518; int32 m_nMenuFadeAlpha; bool m_bPressedPgUpOnList; @@ -532,6 +555,14 @@ public: static bool m_PrefsDisableTutorials;
#endif // !MASTER
+#ifdef MENU_MAP + static bool bMenuMapActive; + static float fMapSize; + static float fMapCenterY; + static float fMapCenterX; + static CSprite2d m_aMapSprites[NUM_MAP_SPRITES]; + void PrintMap(); +#endif public: static void BuildStatLine(char *text, void *stat, uint8 aFloat, void *stat2); |