]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Properly draw respawn info on a new line
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 5 Oct 2012 23:31:02 +0000 (02:31 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 5 Oct 2012 23:31:02 +0000 (02:31 +0300)
qcsrc/client/scoreboard.qc

index 9bcb516a585c43a54ec6f53ad29e564f9e9102cb..c07759fee571a92d40642f4d2500535eedf79401 100644 (file)
@@ -1374,6 +1374,9 @@ 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);
        if(respawn_time)
@@ -1382,20 +1385,20 @@ void HUD_DrawScoreboard()
                {
                        // 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(str, "\n\nRespawning in ", ftos(respawn_time - time), " seconds...");
+                       str = strcat("Respawning in ", ftos(respawn_time - time), " seconds...");
                }
                else if(time < respawn_time)
                {
-                       str = strcat(str, "\n\nYou are dead, wait ", ftos(respawn_time - time), " seconds before respawning");
+                       str = strcat("You are dead, wait ", ftos(respawn_time - time), " seconds before respawning");
                }
                else if(time >= respawn_time)
                {
-                       str = strcat(str, "\n\nYou are dead, press fire to respawn");
+                       str = strcat("You are dead, press fire 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);
+               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);
+       }
 
        scoreboard_bottom = pos_y + 2 * hud_fontsize_y;
 }