diff options
| author | gennariarmando <gennariarmando@outlook.com> | 2020-04-18 18:13:47 +0200 |
|---|---|---|
| committer | gennariarmando <gennariarmando@outlook.com> | 2020-04-18 18:14:38 +0200 |
| commit | ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426 (patch) | |
| tree | 1265448d1033ef26fa09bcb49aa278d9dc6cc43c /src | |
| parent | Changed extraOffset value. (diff) | |
| download | re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar.gz re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar.bz2 re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar.lz re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar.xz re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.tar.zst re3-ffe5dce7f58b6eae5b2bcb6cb9e4d4c0d8a8f426.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/Frontend.cpp | 8 | ||||
| -rw-r--r-- | src/core/config.h | 1 | ||||
| -rw-r--r-- | src/render/Hud.cpp | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index a900d696..eec143c3 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -305,9 +305,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 diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index 03ffe59a..fc399741 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -473,7 +473,12 @@ void CHud::Draw() break; } + +#ifndef HUD_ENHANCEMENTS if (!m_Message[0]) { +#else + if (!m_Message[0] && !m_BigMessage[2][0]) { // Hide zone name if wasted/busted text is displaying +#endif m_ZoneNameTimer += CTimer::GetTimeStepInMilliseconds(); CFont::SetJustifyOff(); CFont::SetPropOn(); @@ -563,7 +568,11 @@ void CHud::Draw() break; } +#ifndef HUD_ENHANCEMENTS if (!m_Message[0]) { +#else + if (!m_Message[0] && !m_BigMessage[2][0]) { // Hide vehicle name if wasted/busted text is displaying +#endif m_VehicleNameTimer += CTimer::GetTimeStepInMilliseconds(); CFont::SetJustifyOff(); CFont::SetPropOn(); |