From: terencehill <piuntn@gmail.com>
Date: Sun, 12 May 2013 18:20:56 +0000 (+0200)
Subject: HUD_FinaleOverlay() stayed there doing nothing for too long
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ae20d7dfdf51062dd918ed23a5ee02ccbef96c4;p=xonotic%2Fxonotic-data.pk3dir.git

HUD_FinaleOverlay() stayed there doing nothing for too long
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index d27fd4d98..a458095cb 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -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();
 	}
-	*/
 }
 
 
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 69d9a3c94..372d3044f 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -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()
 {