Implement fading of panels when showing the scoreboard making use of a new show flag

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 9210b86634ca1e551fb93f0e17f990570cfdf952..f73ee92c6324ed075cac5afa5f9062bb3df11290 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -1,5 +1,6 @@
 #include "hud.qh"
 
+#include "panel/scoreboard.qh"
 #include "hud_config.qh"
 #include "../mapvoting.qh"
 #include "../teamradar.qh"
@@ -357,26 +358,35 @@ void HUD_Vehicle()
        }
 }
 
-bool HUD_Panel_CheckFlags(int showflags)
-{
-    TC(int, showflags);
-       if ( HUD_Minigame_Showpanels() )
-               return showflags & PANEL_SHOW_MINIGAME;
-       if(intermission == 2)
-               return showflags & PANEL_SHOW_MAPVOTE;
-       return showflags & PANEL_SHOW_MAINGAME;
-}
-
 void HUD_Panel_Draw(entity panent)
 {
        panel = panent;
-       if(autocvar__hud_configure)
+       if (autocvar__hud_configure && panel.panel_configflags & PANEL_CONFIG_MAIN)
        {
-               if(panel.panel_configflags & PANEL_CONFIG_MAIN)
-                       panel.panel_draw();
+               panel.panel_draw();
+               return;
        }
-       else if(HUD_Panel_CheckFlags(panel.panel_showflags))
+
+       bool draw_allowed = false;
+       if ((panel.panel_showflags & PANEL_SHOW_MINIGAME) && HUD_Minigame_Showpanels())
+               draw_allowed = true;
+       else if((panel.panel_showflags & PANEL_SHOW_MAPVOTE) && intermission == 2)
+               draw_allowed = true;
+       else if (panel.panel_showflags & PANEL_SHOW_MAINGAME)
+               draw_allowed = true;
+
+       if (draw_allowed)
+       {
+               if (panel.panel_showflags & PANEL_SHOW_WITH_SB)
+                       panel_fade_alpha = 1;
+               else
+               {
+                       panel_fade_alpha = 1 - scoreboard_fade_alpha;
+                       if(!panel_fade_alpha)
+                               return;
+               }
                panel.panel_draw();
+       }
 }
 
 void HUD_Reset()

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index b315a7c0adf8605f5bf9e07342e700471d1f05a5..77ee27d1c12ed4e8e366cd5cd16fc64e46bec4d3 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -181,8 +181,8 @@ const int PANEL_SHOW_NEVER    = 0x00;
 const int PANEL_SHOW_MAINGAME = 0x01;
 const int PANEL_SHOW_MINIGAME = 0x02;
 const int PANEL_SHOW_MAPVOTE  = 0x04;
+const int PANEL_SHOW_WITH_SB  = 0x08;
 const int PANEL_SHOW_ALWAYS   = 0xff;
-bool HUD_Panel_CheckFlags(int showflags);
 
 .int panel_configflags;
 const int PANEL_CONFIG_NO    = 0x00;
@@ -203,31 +203,31 @@ int prev_p_health, prev_p_armor;
 
 void HUD_ItemsTime();
 
-REGISTER_HUD_PANEL(WEAPONS,         HUD_Weapons,        weapons,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(AMMO,            HUD_Ammo,           ammo,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(POWERUPS,        HUD_Powerups,       powerups,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(HEALTHARMOR,     HUD_HealthArmor,    healtharmor,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(NOTIFY,          HUD_Notify,         notify,         PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(TIMER,           HUD_Timer,          timer,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(RADAR,           HUD_Radar,          radar,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(SCORE,           HUD_Score,          score,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(RACETIMER,       HUD_RaceTimer,      racetimer,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(VOTE,            HUD_Vote,           vote,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(MODICONS,        HUD_ModIcons,       modicons,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(PRESSEDKEYS,     HUD_PressedKeys,    pressedkeys,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(CHAT,            HUD_Chat,           chat,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(ENGINEINFO,      HUD_EngineInfo,     engineinfo,     PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(INFOMESSAGES,    HUD_InfoMessages,   infomessages,   PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(PHYSICS,         HUD_Physics,        physics,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(CENTERPRINT,     HUD_CenterPrint,    centerprint,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(MINIGAME_BOARD,  HUD_MinigameBoard,  minigameboard,  PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_STATUS, HUD_MinigameStatus, minigamestatus, PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_HELP,   HUD_MinigameHelp,   minigamehelp,   PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_MENU,   HUD_MinigameMenu,   minigamemenu,   PANEL_CONFIG_NO  , PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(MAPVOTE,         MapVote_Draw,       mapvote,        PANEL_CONFIG_NO  , PANEL_SHOW_MAPVOTE )
-REGISTER_HUD_PANEL(ITEMSTIME,       HUD_ItemsTime,      itemstime,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      quickmenu,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    scoreboard,     PANEL_CONFIG_NO  , PANEL_SHOW_ALWAYS  )
+REGISTER_HUD_PANEL(WEAPONS,         HUD_Weapons,        weapons,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(AMMO,            HUD_Ammo,           ammo,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(POWERUPS,        HUD_Powerups,       powerups,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(HEALTHARMOR,     HUD_HealthArmor,    healtharmor,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(NOTIFY,          HUD_Notify,         notify,         PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME                                          )
+REGISTER_HUD_PANEL(TIMER,           HUD_Timer,          timer,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME                      | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(RADAR,           HUD_Radar,          radar,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(SCORE,           HUD_Score,          score,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME                                          )
+REGISTER_HUD_PANEL(RACETIMER,       HUD_RaceTimer,      racetimer,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(VOTE,            HUD_Vote,           vote,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MODICONS,        HUD_ModIcons,       modicons,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                            | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(PRESSEDKEYS,     HUD_PressedKeys,    pressedkeys,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(CHAT,            HUD_Chat,           chat,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(ENGINEINFO,      HUD_EngineInfo,     engineinfo,     PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(INFOMESSAGES,    HUD_InfoMessages,   infomessages,   PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(PHYSICS,         HUD_Physics,        physics,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(CENTERPRINT,     HUD_CenterPrint,    centerprint,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                            | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MINIGAME_BOARD,  HUD_MinigameBoard,  minigameboard,  PANEL_CONFIG_NO  ,                       PANEL_SHOW_MINIGAME                      | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MINIGAME_STATUS, HUD_MinigameStatus, minigamestatus, PANEL_CONFIG_NO  ,                       PANEL_SHOW_MINIGAME                      | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MINIGAME_HELP,   HUD_MinigameHelp,   minigamehelp,   PANEL_CONFIG_NO  ,                       PANEL_SHOW_MINIGAME                      | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MINIGAME_MENU,   HUD_MinigameMenu,   minigamemenu,   PANEL_CONFIG_NO  , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB)
+REGISTER_HUD_PANEL(MAPVOTE,         MapVote_Draw,       mapvote,        PANEL_CONFIG_NO  ,                                             PANEL_SHOW_MAPVOTE                     )
+REGISTER_HUD_PANEL(ITEMSTIME,       HUD_ItemsTime,      itemstime,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      quickmenu,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME                                                                )
+REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    scoreboard,     PANEL_CONFIG_NO  , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB)
 // always add new panels to the end of list
 
 // Because calling lots of functions in QC apparently cuts fps in half on many machines:
@@ -365,11 +365,10 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    scoreboard,     PANEL_CO
 } MACRO_END
 
 // NOTE: in hud_configure mode cvars must be reloaded every frame
-float _panel_fade_alpha;
-#define HUD_Panel_LoadCvars(theAlpha) MACRO_BEGIN { \
-       _panel_fade_alpha = theAlpha; \
+float panel_fade_alpha;
+#define HUD_Panel_LoadCvars() MACRO_BEGIN { \
        if(autocvar__hud_configure) \
-               _panel_fade_alpha = 1; \
+               panel_fade_alpha = 1; \
        if (panel.update_time <= time) {                                                                                \
                if (autocvar__hud_configure) panel_enabled = cvar(strcat("hud_panel_", panel.panel_name));                  \
                panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos")));                              \
@@ -395,8 +394,8 @@ float _panel_fade_alpha;
                if (hud_configure_menu_open == 2 && panel == highlightedPanel) {                                                       \
                        HUD_Panel_UpdatePosSize_ForMenu();                                                                      \
                } else {                                                                                                    \
-                       panel_bg_alpha *= hud_fade_alpha * _panel_fade_alpha;                                                                       \
-                       panel_fg_alpha *= hud_fade_alpha * _panel_fade_alpha;                                                                       \
+                       panel_bg_alpha *= hud_fade_alpha * panel_fade_alpha;                                                                       \
+                       panel_fg_alpha *= hud_fade_alpha * panel_fade_alpha;                                                                       \
                }                                                                                                           \
                panel.current_panel_pos = panel_pos;                                                                        \
                panel.current_panel_size = panel_size;                                                                      \
@@ -408,12 +407,12 @@ float _panel_fade_alpha;
        } else {                                                                                                        \
                panel_pos = panel.current_panel_pos;                                                                        \
                panel_size = panel.current_panel_size;                                                                      \
-               panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha * _panel_fade_alpha;                                             \
+               panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha * panel_fade_alpha;                                             \
                panel_bg_border = panel.current_panel_bg_border;                                                            \
                panel_bg_color = panel.current_panel_bg_color;                                                              \
                panel_bg_color_team = panel.current_panel_bg_color_team;                                                    \
                panel_bg_padding = panel.current_panel_bg_padding;                                                          \
-               panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha * _panel_fade_alpha;                                             \
+               panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha * panel_fade_alpha;                                             \
        }                                                                                                               \
 } MACRO_END
 

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index db16a869725f23728d27e018163833d4a03a8858..e299d1416ea1485da0cd4dee153aa1afc835dd4f 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -1,6 +1,5 @@
 #include "ammo.qh"
 
-#include "scoreboard.qh"
 #include <common/t_items.qh>
 
 // Ammo (#1)
@@ -105,9 +104,7 @@ void HUD_Ammo()
                        return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 7e7d1ab9a62a45cb2eb43136be42a41fa69d4217..5b80690101b089e0e2cd15df07d40aa05bb9356a 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -153,8 +153,7 @@ void HUD_CenterPrint ()
                }
        }
 
-       // this panel fades only when the menu does
-       HUD_Panel_LoadCvars(1); // keep with the scoreboard
+       HUD_Panel_LoadCvars();
 
        if ( HUD_Radar_Clickable() )
        {

diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc
index 7bb3399901c3a5a80b18724fead2ad84fa66a462..f3655e940107f101933d096b791a60239b1652f9 100644 (file)
--- a/qcsrc/client/hud/panel/chat.qc
+++ b/qcsrc/client/hud/panel/chat.qc
@@ -23,7 +23,7 @@ void HUD_Chat()
                }
        }
 
-       HUD_Panel_LoadCvars(1); // can't be forced to fade with the scoreboard anyway
+       HUD_Panel_LoadCvars();
 
        if(intermission == 2)
        {

diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc
index 3dab433428d61d5797687a786cac172fa6a20b9a..c8b7203eee9cfc240c09ac0556c3709aeaea7b32 100644 (file)
--- a/qcsrc/client/hud/panel/engineinfo.qc
+++ b/qcsrc/client/hud/panel/engineinfo.qc
@@ -19,7 +19,7 @@ void HUD_EngineInfo()
                if(!autocvar_hud_panel_engineinfo) return;
        }
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index bd49ba9dd92339a1550b24a108c558d0720efc78..7f5e4c1709c8486a1d591d7703a31ec5c4c963ad 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -1,6 +1,5 @@
 #include "healtharmor.qh"
 
-#include "scoreboard.qh"
 #include <common/deathtypes/all.qh>
 
 // Health/armor (#3)
@@ -58,9 +57,7 @@ void HUD_HealthArmor()
                fuel = 20;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index a33e08084f9d9616e0681a1a719cd0b4a8e11c9b..cd49f09adc769bc0a5cd66450e8178b04a943e4c 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -1,6 +1,5 @@
 #include "infomessages.qh"
 
-#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
@@ -61,9 +60,7 @@ void HUD_InfoMessages()
                if(!autocvar_hud_panel_infomessages) return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index e432b1d6d8f565dea7052c11ece74cfbde94ab0d..2a12e81c25e140db54908ee2bc4710aabe7d2f5b 100644 (file)
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -771,7 +771,8 @@ void HUD_ModIcons()
 
        //if(mod_alpha <= 0)
        //      return;
-       HUD_Panel_LoadCvars(mod_alpha);
+       panel_fade_alpha *= mod_alpha;
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc
index e6cf6ec1d4f138906dbe0ee2481f576e92b369de..a49d262a4f9075a9ff615d7435974c6a62e39f20 100644 (file)
--- a/qcsrc/client/hud/panel/notify.qc
+++ b/qcsrc/client/hud/panel/notify.qc
@@ -1,6 +1,5 @@
 #include "notify.qh"
 
-#include "scoreboard.qh"
 
 // Notifications (#4)
 
@@ -50,9 +49,8 @@ void HUD_Notify()
                if (!autocvar_hud_panel_notify)
                        return;
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
+
        if (autocvar_hud_panel_notify_dynamichud)
                HUD_Scale_Enable();
        else

diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc
index ff9226fc686c7d16c06ee4415e2923eb857cff6a..6befd1a30a4fe161ea57e386def9eb33f0e2bbfe 100644 (file)
--- a/qcsrc/client/hud/panel/physics.qc
+++ b/qcsrc/client/hud/panel/physics.qc
@@ -1,6 +1,5 @@
 #include "physics.qh"
 
-#include "scoreboard.qh"
 #include <client/main.qh>
 #include <common/mapinfo.qh>
 #include <lib/csqcmodel/cl_player.qh>
@@ -19,9 +18,7 @@ void HUD_Physics()
                if(autocvar_hud_panel_physics == 3 && !(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc
index 3b34be0f69bd53063f441f440b8cb083992443ad..7542e0a81efd9896be632f4162929836fb67a368 100644 (file)
--- a/qcsrc/client/hud/panel/powerups.qc
+++ b/qcsrc/client/hud/panel/powerups.qc
@@ -1,6 +1,5 @@
 #include "powerups.qh"
 
-#include "scoreboard.qh"
 #include <common/items/all.qc>
 
 // Powerups (#2)
@@ -110,9 +109,8 @@ void HUD_Powerups()
                return;
 
        // Draw panel background
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
+
        if (autocvar_hud_panel_powerups_dynamichud)
                HUD_Scale_Enable();
        else

diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc
index 3ca2289c2046739fb0b530cd8da9dc4473b7f176..abb9ccef9aa56910fae3fd52fb1b3e5699e512ab 100644 (file)
--- a/qcsrc/client/hud/panel/pressedkeys.qc
+++ b/qcsrc/client/hud/panel/pressedkeys.qc
@@ -1,6 +1,5 @@
 #include "pressedkeys.qh"
 
-#include "scoreboard.qh"
 
 // Pressed keys (#11)
 
@@ -12,9 +11,7 @@ void HUD_PressedKeys()
                if(spectatee_status <= 0 && autocvar_hud_panel_pressedkeys < 2) return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index 73003b0f12299a3d83d74dde0c12d87c208d4e6c..69d57908788f10512a5bb3ee8d9de162ac65aca5 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -1,6 +1,5 @@
 #include "quickmenu.qh"
 
-#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <client/hud/all.qh>
 #include <client/mapvoting.qh>
@@ -505,9 +504,7 @@ void QuickMenu_Mouse()
                mousepos.y = bound(0, mousepos.y, vid_conheight);
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        if(panel_bg_padding)
        {
@@ -621,9 +618,7 @@ void HUD_QuickMenu()
                }
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        HUD_Scale_Disable();
        HUD_Panel_DrawBg();

diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc
index 5ffa0746385f39dad03cca032e1114b3b5a10ed1..02b631b3000932cbd2ee69f812e5cc8446f2aed1 100644 (file)
--- a/qcsrc/client/hud/panel/racetimer.qc
+++ b/qcsrc/client/hud/panel/racetimer.qc
@@ -1,6 +1,5 @@
 #include "racetimer.qh"
 
-#include "scoreboard.qh"
 #include <common/mapinfo.qh>
 
 // Race timer (#6)
@@ -84,9 +83,7 @@ void HUD_RaceTimer ()
                if(spectatee_status == -1) return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        vector pos, mySize;
        pos = panel_pos;

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index a8b158b7b264e468cea6192427e2308429e2a625..1119187c86dabbd8ffeb4eb5a0a643234b40604b 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -1,6 +1,5 @@
 #include "radar.qh"
 
-#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 #include <client/mapvoting.qh>
@@ -146,9 +145,7 @@ void HUD_Radar_Mouse()
                mousepos_y = bound(0, mousepos_y, vid_conheight);
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
 
        panel_size = autocvar_hud_panel_radar_maximized_size;
@@ -200,9 +197,7 @@ void HUD_Radar()
        if ( hud_panel_radar_temp_hidden )
                return;
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        float f = 0;
 

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index 2a09c0a90494de9151a19ba61b7be1959bfd6b02..4b5df98d19892d237ba925b62f7439afd398eabe 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -140,9 +140,7 @@ void HUD_Score()
                if(spectatee_status == -1 && (gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index a04c6406a83f02610630e7573d09eed7dbbbd065..7e846849fd7ca28320c11df620bb288e1aae2ccc 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1321,7 +1321,8 @@ void Scoreboard_Draw()
 
        if(scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_LoadCvars(scoreboard_fade_alpha);
+       panel_fade_alpha *= scoreboard_fade_alpha;
+       HUD_Panel_LoadCvars();
 
        sbt_bg_alpha = autocvar_hud_panel_scoreboard_table_bg_alpha * panel_fg_alpha;
        sbt_highlight = autocvar_hud_panel_scoreboard_table_highlight;

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 8cb0db7c739e0bd4ed0c6f698875f4eddaf9b73b..fab0392dc08938d19dd27046faf608e9f1241931 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -9,7 +9,7 @@ void HUD_Timer()
                if(!autocvar_hud_panel_timer) return;
        }
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index e9bcc92080c7be33b70ca3911dcbbb867bccaf79..7614eefcc0dbe71c465c71852f7fc21cd3a19680 100644 (file)
--- a/qcsrc/client/hud/panel/vote.qc
+++ b/qcsrc/client/hud/panel/vote.qc
@@ -63,14 +63,14 @@ void HUD_Vote()
        a = vote_alpha * (vote_highlighted ? autocvar_hud_panel_vote_alreadyvoted_alpha : 1);
        if(a <= 0)
                return;
-       //HUD_Panel_LoadCvars(a);
+       //panel_fade_alpha *= a;
        // nothing can hide this panel, not even the menu
        float hud_fade_alpha_save = hud_fade_alpha;
        if(uid2name_dialog && autocvar__menu_alpha)
                hud_fade_alpha = 0;
        else
                hud_fade_alpha = a;
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
        hud_fade_alpha = hud_fade_alpha_save;
 
        if(uid2name_dialog)

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index 774f6f2783d052b53b9b55b93a4cfe889085a6ec..206bebc2f0cec146c9d0425112dfdea995a1729b 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -1,6 +1,5 @@
 #include "weapons.qh"
 
-#include "scoreboard.qh"
 
 // Weapons (#0)
 
@@ -84,9 +83,7 @@ void HUD_Weapons()
        }
 
        // update generic hud functions
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        // figure out weapon order (how the weapons are sorted) // TODO make this configurable
        if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0])

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 516027eef26265a96d35ff6586e2169478665568..b2b5daa73dbf3b08065da65badc3f4f6487ee64b 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -334,9 +334,7 @@ void MapVote_Draw()
        if(!mv_active)
                return;
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        if (!autocvar_hud_cursormode)
        {

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index 2ab0152d3c9e65f8842bf2c20470f3b568251795..12d2f06d18caecf4bbf6f07d8f803e5ef5073544 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -35,7 +35,7 @@ void HUD_MinigameBoard ()
        if ( !hud_minigame )
                return;
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
 
        vector pos, mySize;
@@ -61,7 +61,7 @@ void HUD_MinigameStatus ()
        if ( !hud_minigame )
                return;
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
 
        vector pos, mySize;
@@ -429,7 +429,7 @@ void HUD_MinigameMenu_MouseInput()
 {
        panel = HUD_PANEL(MINIGAME_MENU);
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
        if(panel_bg_padding)
        {
@@ -475,7 +475,7 @@ void HUD_MinigameMenu ()
        if ( !HUD_MinigameMenu_IsOpened() )
                return;
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
        HUD_Scale_Disable();
        HUD_Panel_DrawBg();
@@ -545,7 +545,7 @@ void HUD_MinigameHelp()
        if ( !help_message )
                return;
 
-       HUD_Panel_LoadCvars(1);
+       HUD_Panel_LoadCvars();
 
 
        vector pos, mySize;

diff --git a/qcsrc/common/mutators/mutator/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime.qc
index 3d483a54f52d061ee5f999664dc983e8e15dec74..76fa6fad21b086bcf73f256e64bcbf88e1772354 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime.qc
@@ -306,9 +306,7 @@ void HUD_ItemsTime()
     if (count == 0)
         return;
 
-    if(1 - scoreboard_fade_alpha <= 0)
-        return;
-    HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+    HUD_Panel_LoadCvars();
 
     vector pos, mySize;
     pos = panel_pos;