diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2020-04-20 06:46:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 06:46:44 +0200 |
| commit | 0a07a2233b380bc39f86dc43dfbf6008260ad4ac (patch) | |
| tree | d8d3170adee80fde0426ad0409e35680953ad51c | |
| parent | Merge pull request #478 from Fire-Head/master (diff) | |
| parent | beta OddJob(unique jump etc) sliding text (diff) | |
| download | re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar.gz re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar.bz2 re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar.lz re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar.xz re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.tar.zst re3-0a07a2233b380bc39f86dc43dfbf6008260ad4ac.zip | |
| -rw-r--r-- | src/core/config.h | 1 | ||||
| -rw-r--r-- | src/render/Hud.cpp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/config.h b/src/core/config.h index 4ca79cb5..9f5bfeb6 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -209,6 +209,7 @@ enum Config { #define TRIANGLE_BACK_BUTTON // #define CIRCLE_BACK_BUTTON #define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better. +#define BETA_SLIDING_TEXT // 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 fc399741..137b1afa 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -1240,10 +1240,17 @@ void CHud::DrawAfterFade() CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetFontStyle(FONT_BANK); +#ifdef BETA_SLIDING_TEXT + CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f) - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]); + + CFont::SetColor(CRGBA(156, 91, 40, 255)); + CFont::PrintString(SCREEN_WIDTH / 2 - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]); +#else CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]); CFont::SetColor(CRGBA(156, 91, 40, 255)); CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]); +#endif } } |