From: Samual Lenks <samual@xonotic.org>
Date: Fri, 14 Dec 2012 09:53:16 +0000 (-0500)
Subject: Remove "Respawning now..." from scoreboard respawn count (looks glitchy)
X-Git-Tag: xonotic-v0.7.0~191^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd881f5d4d8b950a8bf896261351a2726d03247c;p=xonotic%2Fxonotic-data.pk3dir.git

Remove "Respawning now..." from scoreboard respawn count (looks glitchy)
---

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 83991f6f1..303be3620 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1385,10 +1385,9 @@ void HUD_DrawScoreboard()
 		{
 			// a negative number means we are awaiting respawn, time value is still the same
 			respawn_time *= -1; // remove mark now that we checked it
-			if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)
-				str = _("^1Respawning...");
-			else
-				str = sprintf(_("^1Respawning in ^3%s^1 seconds..."), ftos_decimals(respawn_time - time, autocvar_scoreboard_respawntime_decimals));
+			respawn_time = max(time, respawn_time); // don't show a negative value while the server is respawning the player (lag)
+			
+			str = sprintf(_("^1Respawning in ^3%s^1 seconds..."), ftos_decimals(respawn_time - time, autocvar_scoreboard_respawntime_decimals));
 		}
 		else if(time < respawn_time)
 			str = sprintf(_("You are dead, wait ^3%s^7 seconds before respawning"), ftos_decimals(respawn_time - time, autocvar_scoreboard_respawntime_decimals));