fix warnings

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 4324d0e04be617b817241e9f9a78ff8193e7e430..8198639a4c686174d763eb284ccc8a2f17c48bb4 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -599,7 +599,7 @@ void CSQC_UpdateView(float w, float h)
                                CSQC_common_hud();
 
                // crosshair goes VERY LAST
-               if(!scoreboard_active && !ons_showmap && !camera_active && !hudconf_active) {
+               if(!scoreboard_active && !camera_active && !hudconf_active) {
                        // TrueAim check
                        float shottype;
                        float bullets, ring_scale;
@@ -950,7 +950,7 @@ void CSQC_SPIDER_HUD()
        }
        */
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -964,10 +964,6 @@ void CSQC_SPIDER_HUD()
 #define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
 #define raptor_s "gfx/vehicles/shiled.tga"
 
-// these are causing warnings!
-#define spider_a1 "gfx/hud/sb_rocket.tga"
-#define spider_a2 "gfx/sb_bullets.tga"
-
 void CSQC_RAPTOR_HUD()
 {
        float rockets, reload, heat, hp, shield, energy;
@@ -1021,7 +1017,7 @@ void CSQC_RAPTOR_HUD()
     drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' *  (1 - reload), 1, DRAWFLAG_NORMAL);
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -1131,7 +1127,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -1153,31 +1149,20 @@ void CSQC_common_hud(void)
                        // hud first
                        HUD_Main();
 
-                       // is this needed?
-                       //HUD_UpdatePlayerTeams();
-
-                       if (intermission == 2) // map voting screen
+                       // scoreboard/accuracy
+                       if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
                        {
-                               if(sb_showaccuracy && spectatee_status != -1) {
-                                       HUD_DrawAccuracyStats();
-                               }
-                               else if(sb_showscores) {
-                                       HUD_DrawScoreboard();
-                               }
-                               else
-                                       HUD_FinaleOverlay();
-
+                               HUD_FinaleOverlay();
                                HUD_Reset();
                        }
-                       else if (sb_showscores || sb_showaccuracy || sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
-                       {
-                               if(sb_showaccuracy && spectatee_status != -1)
-                                       HUD_DrawAccuracyStats();
-                               else
-                                       HUD_DrawScoreboard();
+                       else if(scoreboard_showaccuracy && spectatee_status != -1)
+                               HUD_DrawAccuracyStats();
+                       else
+                               HUD_DrawScoreboard();
 
+                       if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
                                HUD_Reset();
-                       }
+
                        break;
 
                case HUD_SPIDERBOT: