Add option to get 32bpp versions of GUI fonts in FrameMan font getters

Author: MaximDude

Managers/FrameMan.cpp

@@ -62,9 +62,9 @@ namespace RTE {
 		m_BlackColor = 245;
 		m_AlmostBlackColor = 245;
 		m_ColorTablePruneTimer.Reset();
-		m_GUIScreen = nullptr;
-		m_LargeFont = nullptr;
-		m_SmallFont = nullptr;
+		m_GUIScreens.fill(nullptr);
+		m_LargeFonts.fill(nullptr);
+		m_SmallFonts.fill(nullptr);
 		m_TextBlinkTimer.Reset();
 
 		for (int screenCount = 0; screenCount < c_MaxScreenCount; ++screenCount) {
@@ -187,10 +187,15 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void FrameMan::Destroy() {
-		delete m_GUIScreen;
-		delete m_LargeFont;
-		delete m_SmallFont;
-
+		for (const GUIScreen *guiScreen : m_GUIScreens) {
+			delete guiScreen;
+		}
+		for (const GUIFont *guiFont : m_LargeFonts) {
+			delete guiFont;
+		}
+		for (const GUIFont *guiFont : m_SmallFonts) {
+			delete guiFont;
+		}
 		Clear();
 	}
 
@@ -326,7 +331,7 @@ namespace RTE {
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	std::string FrameMan::SplitStringToFitWidth(const std::string &stringToSplit, int widthLimit, bool useSmallFont) {
-		GUIFont *fontToUse = GetFont(useSmallFont);
+		GUIFont *fontToUse = GetFont(useSmallFont, false);
 		auto SplitSingleLineAsNeeded = [this, &widthLimit, &fontToUse](std::string &lineToSplitAsNeeded) {
 			int numberOfScreenWidthsForText = static_cast<int>(std::ceil(static_cast<float>(fontToUse->CalculateWidth(lineToSplitAsNeeded)) / static_cast<float>(widthLimit)));
 			if (numberOfScreenWidthsForText > 1) {
@@ -714,21 +719,39 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	GUIFont * FrameMan::GetFont(bool isSmall) {
-		if (!m_GUIScreen) { m_GUIScreen = new AllegroScreen(m_BackBuffer8.get()); }
+	GUIFont * FrameMan::GetFont(bool isSmall, bool trueColor) {
+		size_t colorIndex = trueColor ? 1 : 0;
+
+		if (!m_GUIScreens[colorIndex]) {
+			m_GUIScreens[colorIndex] = new AllegroScreen(trueColor ? m_BackBuffer32.get() : m_BackBuffer8.get());
+		}
 
 		if (isSmall) {
-			if (!m_SmallFont) {
-				m_SmallFont = new GUIFont("SmallFont");
-				m_SmallFont->Load(m_GUIScreen, "Base.rte/GUIs/Skins/FontSmall.png");
+			if (!m_SmallFonts[colorIndex]) {
+				std::string fontName = "SmallFont";
+				std::string fontPath = "Base.rte/GUIs/Skins/FontSmall.png";
+
+				if (trueColor) {
+					fontName = "SmallFont32";
+					fontPath = "Base.rte/GUIs/Skins/Menus/FontSmall.png";
+				}
+				m_SmallFonts[colorIndex] = new GUIFont(fontName);
+				m_SmallFonts[colorIndex]->Load(m_GUIScreens[colorIndex], fontPath);
 			}
-			return m_SmallFont;
+			return m_SmallFonts[colorIndex];
 		}
-		if (!m_LargeFont) {
-			m_LargeFont = new GUIFont("FatFont");
-			m_LargeFont->Load(m_GUIScreen, "Base.rte/GUIs/Skins/FontLarge.png");
+		if (!m_LargeFonts[colorIndex]) {
+			std::string fontName = "FatFont";
+			std::string fontPath = "Base.rte/GUIs/Skins/FontLarge.png";
+
+			if (trueColor) {
+				fontName = "FatFont32";
+				fontPath = "Base.rte/GUIs/Skins/Menus/FontLarge.png";
+			}
+			m_LargeFonts[colorIndex] = new GUIFont(fontName);
+			m_LargeFonts[colorIndex]->Load(m_GUIScreens[colorIndex], fontPath);
 		}
-		return m_LargeFont;
+		return m_LargeFonts[colorIndex];
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Managers/FrameMan.h

@@ -176,14 +176,16 @@ namespace RTE {
 		/// <summary>
 		/// Gets the small font from the GUI engine's current skin. Ownership is NOT transferred!
 		/// </summary>
+		/// <param name="trueColor">Whether to get the 32bpp color version of the font.</param>
 		/// <returns>A pointer to the requested font, or 0 if no small font was found.</returns>
-		GUIFont * GetSmallFont() { return GetFont(true); }
+		GUIFont * GetSmallFont(bool trueColor = false) { return GetFont(true, trueColor); }
 
 		/// <summary>
 		/// Gets the large font from the GUI engine's current skin. Ownership is NOT transferred!
 		/// </summary>
+		/// <param name="trueColor">Whether to get the 32bpp color version of the font.</param>
 		/// <returns>A pointer to the requested font, or 0 if no large font was found.</returns>
-		GUIFont * GetLargeFont() { return GetFont(false); }
+		GUIFont * GetLargeFont(bool trueColor = false) { return GetFont(false, trueColor); }
 
 		/// <summary>
 		/// Calculates the width of a text string using the given font size.
@@ -493,9 +495,9 @@ namespace RTE {
 		int m_PlayerScreenWidth; //!< Width of the screen of each player. Will be smaller than resolution only if the screen is split.
 		int m_PlayerScreenHeight; //!< Height of the screen of each player. Will be smaller than resolution only if the screen is split.
 
-		AllegroScreen *m_GUIScreen; //!< GUI screen object kept and owned just for the fonts.
-		GUIFont *m_SmallFont; //!< Pointer to the standard small font for quick access.
-		GUIFont *m_LargeFont; //!< Pointer to the standard large font for quick access.
+		std::array<AllegroScreen *, 2> m_GUIScreens; //!< GUI screen objects kept and owned just for the fonts.
+		std::array<GUIFont *, 2> m_SmallFonts; //!< Pointers to the standard small font for quick access.
+		std::array<GUIFont *, 2> m_LargeFonts; //!< Pointers to the standard large font for quick access.
 
 		std::string m_ScreenText[c_MaxScreenCount]; //!< The text to be displayed on each player's screen.
 		bool m_TextCentered[c_MaxScreenCount]; //!< Whether screen text is centered vertically.
@@ -626,8 +628,9 @@ namespace RTE {
 		/// Gets the requested font from the GUI engine's current skin. Ownership is NOT transferred!
 		/// </summary>
 		/// <param name="isSmall">Size of font to get. True for small font, false for large font.</param>
+		/// <param name="trueColor">Whether to get the 32bpp color version of the font.</param>
 		/// <returns>A pointer to the requested font, or 0 if no font was found.</returns>
-		GUIFont * GetFont(bool isSmall);
+		GUIFont * GetFont(bool isSmall, bool trueColor);
 
 		/// <summary>
 		/// Clears all the member variables of this FrameMan, effectively resetting the members of this abstraction level only.