Merge branch 'master' into terencehill/centerprint_stuff

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index c39daf22ecf9d259489df9b3f31f0f008993dba9..37452401021e1479a5bd41f6ab6f0e905272c665 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1421,7 +1421,6 @@ void CSQC_SPIDER_HUD()
        if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
-               HUD_DrawCenterPrint();
        }
 
 }
@@ -1488,7 +1487,6 @@ void CSQC_RAPTOR_HUD()
        if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
-               HUD_DrawCenterPrint();
        }
 
 }
@@ -1598,7 +1596,6 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
        if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
-               HUD_DrawCenterPrint();
        }
 
 }
@@ -1637,25 +1634,12 @@ void CSQC_common_hud(void)
                        HUD_DrawScoreboard();
 
                        if (scoreboard_active) // scoreboard/accuracy
-                       {       
                                HUD_Reset();
-                               // HUD_DrawScoreboard takes care of centerprint_start
-                       }
                        else if (intermission == 2) // map voting screen
                        {
                                HUD_FinaleOverlay();
                                HUD_Reset();
-
-                               centerprint_start_x = 0;
-                               centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
                        }
-                       else // hud
-                       {
-                               centerprint_start_x = 0;
-                               centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
-                       }
-
-                       HUD_DrawCenterPrint();
                        break;
 
                case HUD_SPIDERBOT: