]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove "Respawning now..." from scoreboard respawn count (looks glitchy)
authorSamual Lenks <samual@xonotic.org>
Fri, 14 Dec 2012 09:53:16 +0000 (04:53 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 14 Dec 2012 09:53:16 +0000 (04:53 -0500)
qcsrc/client/scoreboard.qc

index 83991f6f1cb49e9a66eb80170f9488282944a97c..303be36205e39c8b9eaa23815eb5bf84aa440649 100644 (file)
@@ -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));