Client: HUD: Replace m_iTextSize with iCharHeight

tmp64 · Dec 17, 2023 · 0dc650b · 0dc650b
1 parent 63af97e
commit 0dc650b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 25 deletions.
diff --git a/src/game/client/hud.cpp b/src/game/client/hud.cpp
@@ -435,8 +435,6 @@ void CHud::VidInit(void)
 	if (m_iRes == -1)
 		m_iRes = GetHudSize(m_scrinfo, GetMaxHudScale());
 
-	m_iTextSize = GetTextSize();
-
 	// Only load this once
 	if (!m_pSpriteList)
 	{
@@ -839,23 +837,6 @@ EHudScale CHud::DetectMaxHudScale()
 	return pMaxScaleInfo->nScale;
 }
 
-int CHud::GetTextSize()
-{
-	vgui2::HScheme hScheme = g_pVGuiSchemeManager->GetDefaultScheme();
-	if (!hScheme)
-		return 0;
-
-	vgui2::IScheme *pScheme = g_pVGuiSchemeManager->GetIScheme(hScheme);
-	if (!pScheme)
-		return 0;
-
-	vgui2::HFont hFont = pScheme->GetFont("CreditsFont", true);
-	if (!hFont)
-		return 0;
-
-	return g_pVGuiSurface->GetFontTall(hFont);
-}
-
 CON_COMMAND(append, "Puts a command into the end of the command buffer")
 {
 	if (gEngfuncs.Cmd_Argc() != 2)

diff --git a/src/game/client/hud.h b/src/game/client/hud.h
@@ -125,7 +125,6 @@ class CHud
 	int m_Teamplay;
 	int m_iRes = -1;
 	int m_iFontHeight;		//!< Sprite font height
-	int m_iTextSize = 0;	//!< Text font height
 	int m_iWeaponBits;
 	int m_fPlayerDead;
 	int m_iIntermission;
@@ -177,6 +176,9 @@ class CHud
 	int GetHudCharWidth(int c);
 	int CalculateCharWidth(int c);
 
+	//! @returns The font height for string render functions.
+	int GetHudFontSize() { return m_scrinfo.iCharHeight; }
+
 	//-----------------------------------------------------
 	// Sprite functions
 	//-----------------------------------------------------
@@ -306,9 +308,6 @@ class CHud
 	//! Detects the maximum supported HUD scale.
 	EHudScale DetectMaxHudScale();
 
-	//! @returns The font size used by engine text draw functions.
-	int GetTextSize();
-
 	template <typename T>
 	inline T *RegisterHudElem()
 	{

diff --git a/src/game/client/hud/ammohistory.cpp b/src/game/client/hud/ammohistory.cpp
@@ -147,7 +147,7 @@ int HistoryResource::DrawAmmoHistory(float flTime)
 				}
 
 				// Draw the number
-				int yposText = ypos + rcPic.GetHeight() / 2 - gHUD.m_iTextSize / 2;
+				int yposText = ypos + rcPic.GetHeight() / 2 - gHUD.GetHudFontSize() / 2;
 				gHUD.DrawHudNumberString(xpos - itemWidth, yposText, xpos - 100, rgAmmoHistory[i].iCount, r, g, b);
 			}
 			else if (rgAmmoHistory[i].type == HISTSLOT_WEAP)

diff --git a/src/game/client/hud/menu.cpp b/src/game/client/hud/menu.cpp
@@ -142,7 +142,7 @@ void CHudMenu::Draw(float flTime)
 		return;
 
 	// draw the menu, along the left-hand side of the screen
-	const int lineHeight = gHUD.m_iTextSize;
+	const int lineHeight = gHUD.GetHudFontSize();
 
 	// count the number of newlines
 	int nlc = 0;