Rename a macro

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index 5171cb79e27e1e7898bc347347537ae6d68b654b..b315a7c0adf8605f5bf9e07342e700471d1f05a5 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -366,7 +366,7 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    scoreboard,     PANEL_CO
 
 // NOTE: in hud_configure mode cvars must be reloaded every frame
 float _panel_fade_alpha;
-#define HUD_Panel_UpdateCvars(theAlpha) MACRO_BEGIN {                                                                       \
+#define HUD_Panel_LoadCvars(theAlpha) MACRO_BEGIN { \
        _panel_fade_alpha = theAlpha; \
        if(autocvar__hud_configure) \
                _panel_fade_alpha = 1; \

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index 5561c022ca6d906ba45a52b374f47c1faa5483bc..db16a869725f23728d27e018163833d4a03a8858 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -107,7 +107,7 @@ void HUD_Ammo()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        draw_beginBoldFont();
 

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

diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc
index f27e9625b463084459b8b41c06f9936ca8204601..7bb3399901c3a5a80b18724fead2ad84fa66a462 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_UpdateCvars(1); // can't be forced to fade with the scoreboard anyway
+       HUD_Panel_LoadCvars(1); // can't be forced to fade with the scoreboard anyway
 
        if(intermission == 2)
        {

diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc
index b0cc374199f5e1830e8afcc15835044092f320ae..3dab433428d61d5797687a786cac172fa6a20b9a 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_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
        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 6407628e85b5cf25bae92169f6a8bb4e053f9e8f..bd49ba9dd92339a1550b24a108c558d0720efc78 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -60,7 +60,7 @@ void HUD_HealthArmor()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 4037d5bef49735409d0bdfe3a041f031b8ff37ce..a33e08084f9d9616e0681a1a719cd0b4a8e11c9b 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -63,7 +63,7 @@ void HUD_InfoMessages()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
        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 fe0bd497b3d298104aee46d4c76f9941eb7ec682..e432b1d6d8f565dea7052c11ece74cfbde94ab0d 100644 (file)
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -771,7 +771,7 @@ void HUD_ModIcons()
 
        //if(mod_alpha <= 0)
        //      return;
-       HUD_Panel_UpdateCvars(mod_alpha);
+       HUD_Panel_LoadCvars(mod_alpha);
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc
index d132ed44b0c35ee25406248d28f110d91196482f..e6cf6ec1d4f138906dbe0ee2481f576e92b369de 100644 (file)
--- a/qcsrc/client/hud/panel/notify.qc
+++ b/qcsrc/client/hud/panel/notify.qc
@@ -52,7 +52,7 @@ void HUD_Notify()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
        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 6176cdf4642787c6253cd02abded9423a8b98271..ff9226fc686c7d16c06ee4415e2923eb857cff6a 100644 (file)
--- a/qcsrc/client/hud/panel/physics.qc
+++ b/qcsrc/client/hud/panel/physics.qc
@@ -21,7 +21,7 @@ void HUD_Physics()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc
index e2b47e216cd5a4387405e47eaaa6216904faf504..3b34be0f69bd53063f441f440b8cb083992443ad 100644 (file)
--- a/qcsrc/client/hud/panel/powerups.qc
+++ b/qcsrc/client/hud/panel/powerups.qc
@@ -112,7 +112,7 @@ void HUD_Powerups()
        // Draw panel background
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
        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 e44eca5f7483c36ea022561dee76b35b2b460a78..3ca2289c2046739fb0b530cd8da9dc4473b7f176 100644 (file)
--- a/qcsrc/client/hud/panel/pressedkeys.qc
+++ b/qcsrc/client/hud/panel/pressedkeys.qc
@@ -14,7 +14,7 @@ void HUD_PressedKeys()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
        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 67fc9e6c8eaca23d505d6382ebd46cbb437a5c4b..73003b0f12299a3d83d74dde0c12d87c208d4e6c 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -507,7 +507,7 @@ void QuickMenu_Mouse()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        if(panel_bg_padding)
        {
@@ -623,7 +623,7 @@ void HUD_QuickMenu()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        HUD_Scale_Disable();
        HUD_Panel_DrawBg();

diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc
index deec4a80f1a755b7dd24a63d272c85298d6c8264..5ffa0746385f39dad03cca032e1114b3b5a10ed1 100644 (file)
--- a/qcsrc/client/hud/panel/racetimer.qc
+++ b/qcsrc/client/hud/panel/racetimer.qc
@@ -86,7 +86,7 @@ void HUD_RaceTimer ()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        vector pos, mySize;
        pos = panel_pos;

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index c357c6b999bc895ca0b56ee11bc654b20169fc80..a8b158b7b264e468cea6192427e2308429e2a625 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -148,7 +148,7 @@ void HUD_Radar_Mouse()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
 
        panel_size = autocvar_hud_panel_radar_maximized_size;
@@ -202,7 +202,7 @@ void HUD_Radar()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        float f = 0;
 

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index 2843b86f30d382844faf7a1beca0b6d88577c23e..2a09c0a90494de9151a19ba61b7be1959bfd6b02 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -142,7 +142,7 @@ void HUD_Score()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
        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 34b4f57d2207c4cb941e38cc24903a892ce30236..a04c6406a83f02610630e7573d09eed7dbbbd065 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1321,7 +1321,7 @@ void Scoreboard_Draw()
 
        if(scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(scoreboard_fade_alpha);
 
        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 85341b4313f8012b3a546e9d96fe229d64c2d0d2..8cb0db7c739e0bd4ed0c6f698875f4eddaf9b73b 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_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
        draw_beginBoldFont();
 

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index b6622f8aa871412f24e20f9fd7231e64c8f474ac..e9bcc92080c7be33b70ca3911dcbbb867bccaf79 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_UpdateCvars(a);
+       //HUD_Panel_LoadCvars(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_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
        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 1006e7a903888326a7e27c0f57207475b092bc97..774f6f2783d052b53b9b55b93a4cfe889085a6ec 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -86,7 +86,7 @@ void HUD_Weapons()
        // update generic hud functions
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        // 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 d09dcb41799a549293e94ffdc867c32fb4cc582d..516027eef26265a96d35ff6586e2169478665568 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -336,7 +336,7 @@ void MapVote_Draw()
 
        if(1 - scoreboard_fade_alpha <= 0)
                return;
-       HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
 
        if (!autocvar_hud_cursormode)
        {

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index f0d51d8d0280ac2caef78313e716240ed8b69feb..2ab0152d3c9e65f8842bf2c20470f3b568251795 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_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
 
        vector pos, mySize;
@@ -61,7 +61,7 @@ void HUD_MinigameStatus ()
        if ( !hud_minigame )
                return;
 
-       HUD_Panel_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
 
        vector pos, mySize;
@@ -429,7 +429,7 @@ void HUD_MinigameMenu_MouseInput()
 {
        panel = HUD_PANEL(MINIGAME_MENU);
 
-       HUD_Panel_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
        if(panel_bg_padding)
        {
@@ -475,7 +475,7 @@ void HUD_MinigameMenu ()
        if ( !HUD_MinigameMenu_IsOpened() )
                return;
 
-       HUD_Panel_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
        HUD_Scale_Disable();
        HUD_Panel_DrawBg();
@@ -545,7 +545,7 @@ void HUD_MinigameHelp()
        if ( !help_message )
                return;
 
-       HUD_Panel_UpdateCvars(1);
+       HUD_Panel_LoadCvars(1);
 
 
        vector pos, mySize;

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