diff options
author | erorcun <erayorcunus@gmail.com> | 2020-04-18 21:38:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-18 21:38:33 +0300 |
commit | 6e24cb28ad0b1b0cdae7eee015f1ad7a8ae09206 (patch) | |
tree | 44739623bb7c4b981495e41a31af7ca56db4cd64 /src/core | |
parent | 928ac4b0a5801043be6685955777b08f1a47518b (diff) | |
parent | ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426 (diff) |
Merge pull request #472 from gennariarmando/master
Hide Vehicle/Zone name during Wasted/Busted...
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Frontend.cpp | 8 | ||||
-rw-r--r-- | src/core/config.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index e4f8ac96..0966b2a2 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -303,9 +303,11 @@ ScaleAndCenterX(float x) } while(0) #define ProcessRadioIcon(sprite, x, y, radioId, hoverOpt) \ - sprite.Draw(x, y, MENU_X(MENURADIO_ICON_SCALE), MENU_Y(MENURADIO_ICON_SCALE), radioId == m_PrefsRadioStation ? CRGBA(255, 255, 255, 255) : CRGBA(225, 0, 0, 170)); \ - if (CheckHover(x, x + MENU_X(MENURADIO_ICON_SCALE), y, y + MENU_Y(MENURADIO_ICON_SCALE))) \ - m_nHoverOption = hoverOpt; + do { \ + sprite.Draw(x, y, MENU_X(MENURADIO_ICON_SCALE), MENU_Y(MENURADIO_ICON_SCALE), radioId == m_PrefsRadioStation ? CRGBA(255, 255, 255, 255) : CRGBA(225, 0, 0, 170)); \ + if (CheckHover(x, x + MENU_X(MENURADIO_ICON_SCALE), y, y + MENU_Y(MENURADIO_ICON_SCALE))) \ + m_nHoverOption = hoverOpt; \ + } while (0) // --- Functions not in the game/inlined starts diff --git a/src/core/config.h b/src/core/config.h index ba684092..12e6ed69 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -208,6 +208,7 @@ enum Config { #define SCROLLABLE_STATS_PAGE // only draggable by mouse atm #define TRIANGLE_BACK_BUTTON // #define CIRCLE_BACK_BUTTON +#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better. // Script #define USE_DEBUG_SCRIPT_LOADER // makes game load main_freeroam.scm by default |