Merge pull request #257 from ScriptedSnark/extended_hud

Client: HUD: Support 4+ digits for health/armor HUD elements
tmp64 · Dec 31, 2024 · 3b4cdcf · 3b4cdcf
2 parents b06b59d + 0318a7f
commit 3b4cdcf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/game/client/hud/battery.cpp b/src/game/client/hud/battery.cpp
@@ -55,7 +55,6 @@ int CHudBattery::MsgFunc_Battery(const char *pszName, int iSize, void *pbuf)
 
 	BEGIN_READ(pbuf, iSize);
 	int battery = READ_SHORT();
-	battery = clamp(battery, 0, 999);
 
 	if (battery != m_iBat)
 	{
@@ -121,5 +120,9 @@ void CHudBattery::Draw(float flTime)
 	}
 
 	x += m_rc1.GetWidth();
-	x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iBat, r, g, b);
+
+	if (m_iBat < 1000)
+		x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iBat, r, g, b);
+	else
+		x = gHUD.DrawHudNumber(x, y, m_iBat, r, g, b);
 }
diff --git a/src/game/client/hud/health.cpp b/src/game/client/hud/health.cpp
@@ -191,7 +191,7 @@ void CHudHealth::Draw(float flTime)
 	// Apply wider range health from client_state_t structure, if available
 	cl_entity_t *player = gEngfuncs.GetLocalPlayer();
 	int health = player->curstate.health;
-	health = clamp(health, 0, 999);
+
 	if (m_iHealth != health && health > 255)
 	{
 		m_fFade = FADE_TIME;
@@ -221,7 +221,10 @@ void CHudHealth::Draw(float flTime)
 
 		x = CrossWidth + HealthWidth / 2;
 
-		x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iHealth, r, g, b);
+		if (m_iHealth < 1000)
+			x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iHealth, r, g, b);
+		else
+			x = gHUD.DrawHudNumber(x, y, m_iHealth, r, g, b);
 
 		x += HealthWidth / 2;