Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 104c44252ce34cf2cb1de40c2e50978b2ea4a5d9..529500b4e0573f56c42d2b65327ebfa15164cd3a 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -9,7 +9,7 @@ float scoreboard_alpha_name_self;
 void drawstringright(vector, string, vector, vector, float, float);
 void drawstringcenter(vector, string, vector, vector, float, float);
 
-float SCOREBOARD_OFFSET = 50;
+const float SCOREBOARD_OFFSET = 50;
 
 // wrapper to put all possible scores titles through gettext
 string TranslateScoresLabel(string l)
@@ -1069,15 +1069,10 @@ vector HUD_DrawKeyValue(vector pos, string key, string value) {
 
 vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) {
        float stat_secrets_found, stat_secrets_total;
-       float stat_current_wave, stat_totalwaves;
        float stat_monsters_killed, stat_monsters_total;
        float rows = 0;
        string val;
        
-       // get tower defense stats
-       stat_current_wave = getstatf(STAT_CURRENT_WAVE);
-       stat_totalwaves = getstatf(STAT_TOTALWAVES);
-       
        // get monster stats
        stat_monsters_killed = getstatf(STAT_MONSTERS_KILLED);
        stat_monsters_total = getstatf(STAT_MONSTERS_TOTAL);
@@ -1089,8 +1084,6 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) {
        // get number of rows
        if(stat_secrets_total)
                rows += 1;
-       if(stat_totalwaves)
-               rows += 1;
        if(stat_monsters_total)
                rows += 1;
 
@@ -1113,13 +1106,6 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) {
                drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
        drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
        
-       // draw waves
-       if(stat_totalwaves)
-       {
-               val = sprintf("%d/%d", stat_current_wave, stat_totalwaves);
-               pos = HUD_DrawKeyValue(pos, _("Current wave:"), val);
-       }
-       
        // draw monsters
        if(stat_monsters_total)
        {