Use ftos_decimals instead of foolshly bounding and substring-ing the value. Respawn...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / scoreboard.qc

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index ede635491322fd00ca1e2a94a4d1e2298fa5c367..9bc340abcceb17c219ae0501dce46eb19fd86720 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1377,24 +1377,20 @@ void HUD_DrawScoreboard()
        pos_y += 1.2 * hud_fontsize_y;
        drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
-       // add information about respawn status
-       float respawn_time = getstatf(STAT_RESPAWN_SCHEDULE);
+       // print information about respawn status
+       float respawn_time = getstatf(STAT_RESPAWN_TIME);
        if(respawn_time)
        {
                if(respawn_time < 0)
                {
-                       // a negative value means we are awaiting respawn, time value is still the same
-                       respawn_time *= -1; // remove our mark now that we checked it
-                       str = strcat("Respawning in ^3", substring(ftos(respawn_time - time), 0, 4), "^7 seconds...");
+                       // a negative number means we are awaiting respawn, time value is still the same
+                       respawn_time *= -1; // remove mark now that we checked it
+                       str = strcat("^1Respawning in ^3", ftos_decimals(respawn_time - time, 2), "^1 seconds...");
                }
                else if(time < respawn_time)
-               {
-                       str = strcat("You are dead, wait ^3", substring(ftos(respawn_time - time), 0, 4), "^7 seconds before respawning");
-               }
+                       str = strcat("You are dead, wait ^3", ftos_decimals(respawn_time - time, 2), "^7 seconds before respawning");
                else if(time >= respawn_time)
-               {
-                       str = strcat("You are dead, press ^1", getcommandkey("primary fire", "+fire"), "^7 to respawn");
-               }
+                       str = strcat("You are dead, press ^2", getcommandkey("primary fire", "+fire"), "^7 to respawn");
 
                pos_y += 1.2 * hud_fontsize_y;
                drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);