fixed that player name and ping overlap in the scoreboard. Closes #106

1 files changed, 11 insertions, 8 deletions

diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp
index 7ea7cfc9..25e71f8b 100644
--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@@ -232,19 +232,22 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
 		float FontSizeResize = FontSize;
 		float Width;
 		const float ScoreWidth = 60.0f;
+		const float PingWidth = 60.0f;
 		str_format(aBuf, sizeof(aBuf), "%d", clamp(pInfo->m_Score, -9999, 9999));
 		while((Width = TextRender()->TextWidth(0, FontSizeResize, aBuf, -1)) > ScoreWidth)
 			--FontSizeResize;
 		TextRender()->Text(0, x+ScoreWidth-Width, y+(FontSize-FontSizeResize)/2, FontSizeResize, aBuf, -1);
 		
-		float FontSizeName = FontSize;
-		while(TextRender()->TextWidth(0, FontSizeName, m_pClient->m_aClients[pInfo->m_ClientId].m_aName, -1) > w-200)
-			--FontSizeName;
-		TextRender()->Text(0, x+128, y+(FontSize-FontSizeName)/2, FontSizeName, m_pClient->m_aClients[pInfo->m_ClientId].m_aName, -1);
-
-		str_format(aBuf, sizeof(aBuf), "%4d", pInfo->m_Latency);
-		float tw = TextRender()->TextWidth(0, FontSize, aBuf, -1);
-		TextRender()->Text(0, x+w-tw-35, y, FontSize, aBuf, -1);
+		FontSizeResize = FontSize;
+		while(TextRender()->TextWidth(0, FontSizeResize, m_pClient->m_aClients[pInfo->m_ClientId].m_aName, -1) > w-163.0f-PingWidth)
+			--FontSizeResize;
+		TextRender()->Text(0, x+128.0f, y+(FontSize-FontSizeResize)/2, FontSizeResize, m_pClient->m_aClients[pInfo->m_ClientId].m_aName, -1);
+
+		FontSizeResize = FontSize;
+		str_format(aBuf, sizeof(aBuf), "%d", clamp(pInfo->m_Latency, -9999, 9999));
+		while((Width = TextRender()->TextWidth(0, FontSizeResize, aBuf, -1)) > PingWidth)
+			--FontSizeResize;
+		TextRender()->Text(0, x+w-35.0f-Width, y+(FontSize-FontSizeResize)/2, FontSizeResize, aBuf, -1);
 
 		// render avatar
 		if((m_pClient->m_Snap.m_paFlags[0] && m_pClient->m_Snap.m_paFlags[0]->m_CarriedBy == pInfo->m_ClientId) ||