Merge pull request #479 from Fire-Head/master

OddJob sliding text
GTAmodding · Apr 20, 2020 · 0a07a2233b380bc39f86dc43dfbf6008260ad4ac · 0a07a22
2 parents 37e9201 + 8381016
commit 0a07a2233b380bc39f86dc43dfbf6008260ad4ac
Unified Split

Showing with 8 additions and 0 deletions.

+1 −0 src/core/config.h

+7 −0 src/render/Hud.cpp
diff --git 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
@@ -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
 		}
 	}