]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
HUD_FinaleOverlay() stayed there doing nothing for too long
authorterencehill <piuntn@gmail.com>
Sun, 12 May 2013 18:20:56 +0000 (20:20 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 12 May 2013 18:20:56 +0000 (20:20 +0200)
qcsrc/client/View.qc
qcsrc/client/scoreboard.qc

index d27fd4d98e8927cddc2fa255496a39124c2c27af..a458095cb0555f0674c453668f1ffe346e88bd91 100644 (file)
@@ -1541,32 +1541,16 @@ void CSQC_common_hud(void)
        if(!(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS))
                Accuracy_LoadLevels();
 
-    HUD_Main(); // always run these functions for alpha checks
-    HUD_DrawScoreboard();
-
-    if (scoreboard_active) // scoreboard/accuracy
-        HUD_Reset();
-    else if (intermission == 2) // map voting screen
-    {
-        HUD_FinaleOverlay();
-        HUD_Reset();
-    }
-       /*
-       switch(hud)
-       {
-               case HUD_SPIDERBOT:
-                       CSQC_SPIDER_HUD();
-                       break;
+       HUD_Main(); // always run these functions for alpha checks
+       HUD_DrawScoreboard();
 
-               case HUD_WAKIZASHI:
-                       CSQC_WAKIZASHI_HUD();
-                       break;
-
-        case HUD_BUMBLEBEE:
-            CSQC_BUMBLE_HUD();
-            break;
+       if (scoreboard_active) // scoreboard/accuracy
+               HUD_Reset();
+       else if (intermission == 2) // map voting screen
+       {
+               MapVote_Draw();
+               HUD_Reset();
        }
-       */
 }
 
 
index 69d9a3c948e5b1bd851d21fbb7570d39c8f2d7cd..372d3044f13f194ef39f3155006ed4f3a8ddc663 100644 (file)
@@ -53,20 +53,6 @@ string TranslateScoresLabel(string l)
        }
 }
 
-void MapVote_Draw();
-void HUD_FinaleOverlay()
-{
-       /*vector pos;
-       pos_x = (vid_conwidth - 1)/2;
-       pos_y = 16;
-       pos_z = 0;*/
-
-       //drawpic(pos, "gfx/finale", '0 0 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       //drawstring(pos, "END", hud_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-       MapVote_Draw();
-}
-
 void Cmd_HUD_SetFields(float argc);
 void HUD_InitScores()
 {