From 3d632e50853d7bf6e499fc4400e5f4254ad54a1c Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 16 Aug 2016 22:39:37 +0200 Subject: [PATCH] Rename a macro --- qcsrc/client/hud/hud.qh | 2 +- qcsrc/client/hud/panel/ammo.qc | 2 +- qcsrc/client/hud/panel/centerprint.qc | 2 +- qcsrc/client/hud/panel/chat.qc | 2 +- qcsrc/client/hud/panel/engineinfo.qc | 2 +- qcsrc/client/hud/panel/healtharmor.qc | 2 +- qcsrc/client/hud/panel/infomessages.qc | 2 +- qcsrc/client/hud/panel/modicons.qc | 2 +- qcsrc/client/hud/panel/notify.qc | 2 +- qcsrc/client/hud/panel/physics.qc | 2 +- qcsrc/client/hud/panel/powerups.qc | 2 +- qcsrc/client/hud/panel/pressedkeys.qc | 2 +- qcsrc/client/hud/panel/quickmenu.qc | 4 ++-- qcsrc/client/hud/panel/racetimer.qc | 2 +- qcsrc/client/hud/panel/radar.qc | 4 ++-- qcsrc/client/hud/panel/score.qc | 2 +- qcsrc/client/hud/panel/scoreboard.qc | 2 +- qcsrc/client/hud/panel/timer.qc | 2 +- qcsrc/client/hud/panel/vote.qc | 4 ++-- qcsrc/client/hud/panel/weapons.qc | 2 +- qcsrc/client/mapvoting.qc | 2 +- qcsrc/common/minigames/cl_minigames_hud.qc | 10 +++++----- qcsrc/common/mutators/mutator/itemstime.qc | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index 5171cb79e..b315a7c0a 100644 --- 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 5561c022c..db16a8697 100644 --- 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 decbe8f2d..7e7d1ab9a 100644 --- 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 f27e9625b..7bb339990 100644 --- 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 b0cc37419..3dab43342 100644 --- 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 6407628e8..bd49ba9dd 100644 --- 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 4037d5bef..a33e08084 100644 --- 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 fe0bd497b..e432b1d6d 100644 --- 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 d132ed44b..e6cf6ec1d 100644 --- 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 6176cdf46..ff9226fc6 100644 --- 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 e2b47e216..3b34be0f6 100644 --- 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 e44eca5f7..3ca2289c2 100644 --- 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 67fc9e6c8..73003b0f1 100644 --- 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 deec4a80f..5ffa07463 100644 --- 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 c357c6b99..a8b158b7b 100644 --- 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 2843b86f3..2a09c0a90 100644 --- 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 34b4f57d2..a04c6406a 100644 --- 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 85341b431..8cb0db7c7 100644 --- 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 b6622f8aa..e9bcc9208 100644 --- 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 1006e7a90..774f6f278 100644 --- 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 d09dcb417..516027eef 100644 --- 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 f0d51d8d0..2ab0152d3 100644 --- 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 1ec116f03..3d483a54f 100644 --- 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; -- 2.39.2