Remove the HUD_WriteCvars hook as it's no longer needed now. Mods using it must simpl...

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index 58f46b8af98c164ac71147b93caab8708dc48ecc..2c12a6150ee560b528fdabb787029b209c80091f 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -16,7 +16,7 @@ REGISTER_REGISTRY(hud_panels)
 
 #define _REGISTER_HUD_PANEL(id, draw_func, export_func, configflags, showflags) \
        void draw_func(); \
-       void export_func(entity panel, int fh); \
+       void export_func(int fh); \
        REGISTER(hud_panels, HUD_PANEL, id, m_id, new_pure(hud_panel)) { \
                this.panel_id = this.m_id; \
                this.panel_draw = draw_func; \
@@ -154,7 +154,7 @@ float panel_bg_padding;
 string panel_bg_padding_str;
 
 classfield(HUDPanel) .void() panel_draw;
-classfield(HUDPanel) .void(entity panel, int fh) panel_export;
+classfield(HUDPanel) .void(int fh) panel_export;
 
 // chat panel can be reduced / moved while the mapvote is active
 // let know the mapvote panel about chat pos and size

diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc
index 6858a84b2194e3f67c364b43d526f8cd24ace911..c4ae095ac3c559c7c3fd67a06084f990f0246e0a 100644 (file)
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -72,10 +72,9 @@ void HUD_Panel_ExportCfg(string cfgname)
                        HUD_Write_PanelCvar("_bg_alpha");
                        HUD_Write_PanelCvar("_bg_border");
                        HUD_Write_PanelCvar("_bg_padding");
-                       panel.panel_export(panel, fh);
+                       panel.panel_export(fh);
                        HUD_Write("\n");
                }
-               MUTATOR_CALLHOOK(HUD_WriteCvars, fh);
 
                HUD_Write("menu_sync\n"); // force the menu to reread the cvars, so that the dialogs are updated
 

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index fbe1aa5ce24cf303022cd44d354632b2ef2d74c9..5abbbf036bc4e2c9b1dae289c8595f83fec6e7d0 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -10,7 +10,7 @@
 
 // Ammo (#1)
 
-void HUD_Ammo_Export(entity panel, int fh)
+void HUD_Ammo_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_ammo_onlycurrent");

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 1b2f3fe04466178cda9164bd50ebfb388727c11f..2f5aab5ed9f49b021e57db2a9fa0ee73f23a6525 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -7,7 +7,7 @@
 
 // CenterPrint (#16)
 
-void HUD_CenterPrint_Export(entity panel, int fh)
+void HUD_CenterPrint_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_centerprint_align");

diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc
index 7b405d5bb10c097fdb3cab9c396d938e492e8476..78cc6a0ef9066ae8291d52d3f0ea7f34a49b0c34 100644 (file)
--- a/qcsrc/client/hud/panel/chat.qc
+++ b/qcsrc/client/hud/panel/chat.qc
@@ -6,7 +6,7 @@
 
 // Chat (#12)
 
-void HUD_Chat_Export(entity panel, int fh)
+void HUD_Chat_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }

diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc
index db376a2ce859b389541b763cbcfc1177d448e9fa..908aa1defe7c68e76df489e0238fbaab3a62bf11 100644 (file)
--- a/qcsrc/client/hud/panel/engineinfo.qc
+++ b/qcsrc/client/hud/panel/engineinfo.qc
@@ -5,7 +5,7 @@
 
 // Engine info (#13)
 
-void HUD_EngineInfo_Export(entity panel, int fh)
+void HUD_EngineInfo_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_engineinfo_framecounter_time");

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index d63b3d97bc2e3970071ce7ca6891c94489fdb0bc..b1a9311939e33ea9f368f15baef17a441045331f 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -7,7 +7,7 @@
 
 // Health/armor (#3)
 
-void HUD_HealthArmor_Export(entity panel, int fh)
+void HUD_HealthArmor_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_healtharmor_combined");

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 803491f843ffda1ef73900ff6bf7b643ce0bd7be..363465dfb77ff4723ac42c4a258c9864dae0d9b2 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -8,7 +8,7 @@
 
 // Info messages (#14)
 
-void HUD_InfoMessages_Export(entity panel, int fh)
+void HUD_InfoMessages_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_infomessages_flip");

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index b206609b3fe435f676beed1b9af0c74ba7add3a1..0a8b8cf5ed18f8d6815c02a194130fd37b15e5a6 100644 (file)
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -9,7 +9,7 @@
 
 // Mod icons (#10)
 
-void HUD_ModIcons_Export(entity panel, int fh)
+void HUD_ModIcons_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_modicons_ca_layout");

diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc
index b562fdb61c0a7abd79734337481369881ffe898f..bfb23bf2c7e6bf2183bf092d09b55964958226f1 100644 (file)
--- a/qcsrc/client/hud/panel/notify.qc
+++ b/qcsrc/client/hud/panel/notify.qc
@@ -5,7 +5,7 @@
 
 // Notifications (#4)
 
-void HUD_Notify_Export(entity panel, int fh)
+void HUD_Notify_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_notify_flip");

diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc
index e2be0de0059ed821ff92ec72d9c87794afb97e03..a451f924b029d386b86365fa50d2fdb610bbc9a2 100644 (file)
--- a/qcsrc/client/hud/panel/physics.qc
+++ b/qcsrc/client/hud/panel/physics.qc
@@ -9,7 +9,7 @@
 
 // Physics (#15)
 
-void HUD_Physics_Export(entity panel, int fh)
+void HUD_Physics_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_physics_speed_unit_show");

diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc
index d68a60f3182ff8676ce43d224dd9206c275e20e4..1662415edda0e77e51cbea992f25cbbb54ec96ff 100644 (file)
--- a/qcsrc/client/hud/panel/powerups.qc
+++ b/qcsrc/client/hud/panel/powerups.qc
@@ -7,7 +7,7 @@
 
 // Powerups (#2)
 
-void HUD_Powerups_Export(entity panel, int fh)
+void HUD_Powerups_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_powerups_iconalign");

diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc
index ed9ab7ded66446bbc847fcb23d01c97c37184324..73bd583bcd5b44b85d62c3dc45b6f1457c299346 100644 (file)
--- a/qcsrc/client/hud/panel/pressedkeys.qc
+++ b/qcsrc/client/hud/panel/pressedkeys.qc
@@ -6,7 +6,7 @@
 
 // Pressed keys (#11)
 
-void HUD_PressedKeys_Export(entity panel, int fh)
+void HUD_PressedKeys_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_pressedkeys_aspect");

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index de7489ca80693af470c7111782b5813b1442b58e..66ee555b43910b1472ba1b59555741972c90f176 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -10,7 +10,7 @@
 
 // QuickMenu (#23)
 
-void HUD_QuickMenu_Export(entity panel, int fh)
+void HUD_QuickMenu_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_quickmenu_align");

diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc
index 326d776539f1117baba1f0a4a5984d1dd909a72e..cd0b26e0bd7af067bd797092e82f045b20b796dc 100644 (file)
--- a/qcsrc/client/hud/panel/racetimer.qc
+++ b/qcsrc/client/hud/panel/racetimer.qc
@@ -7,7 +7,7 @@
 
 // Race timer (#8)
 
-void HUD_RaceTimer_Export(entity panel, int fh)
+void HUD_RaceTimer_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 0737156952c80cb7316d3c6c19bdebb5a0acc9dd..b75b36d33fbd632bda6c81609e76bd2b2fb1cbfe 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -12,7 +12,7 @@
 
 // Radar (#6)
 
-void HUD_Radar_Export(entity panel, int fh)
+void HUD_Radar_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_radar_foreground_alpha");

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index a4820d74c12554be59ff3bec59faf23916ce92f8..10aec79ff6939f663dea3139994111e894a21f8c 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -10,7 +10,7 @@
 
 // Score (#7)
 
-void HUD_Score_Export(entity panel, int fh)
+void HUD_Score_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_score_rankings");

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 5ab3688f37de10010b95e3d3706d791fd4bd5490..962759011a9e3d2b13e9f5e69d228f1e0cb75a6d 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -16,7 +16,7 @@
 
 // Scoreboard (#24)
 
-void Scoreboard_Draw_Export(entity panel, int fh)
+void Scoreboard_Draw_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_scoreboard_fadeinspeed");

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 3cb587c0baefd0b22ca4a9a156eee617bdcfbb10..8bb4ade6a17f49aca0f69be10c5ffa303069af2f 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -6,7 +6,7 @@
 
 // Timer (#5)
 
-void HUD_Timer_Export(entity panel, int fh)
+void HUD_Timer_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index 0dd509163f881ae89613886ef85779af500a0355..4aab1b93bb520315148e1574e95ccf1b8d111bf2 100644 (file)
--- a/qcsrc/client/hud/panel/vote.qc
+++ b/qcsrc/client/hud/panel/vote.qc
@@ -7,7 +7,7 @@
 
 // Vote (#9)
 
-void HUD_Vote_Export(entity panel, int fh)
+void HUD_Vote_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_vote_alreadyvoted_alpha");

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index 4f452e04b8e83ec6be2ed58f8768342f0c231671..f7444daaa3572cd063eaa62f454430f8ef353db0 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -8,7 +8,7 @@
 
 // Weapons (#0)
 
-void HUD_Weapons_Export(entity panel, int fh)
+void HUD_Weapons_Export(int fh)
 {
        HUD_Write_Cvar("hud_panel_weapons_accuracy");
        HUD_Write_Cvar("hud_panel_weapons_label");

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index c206e773f823a6297d796600982465cf140730d0..c025bdd4651229ed39d182281ca9f4542b31fb59 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -10,7 +10,7 @@
 
 // MapVote (#21)
 
-void MapVote_Draw_Export(entity panel, int fh)
+void MapVote_Draw_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_mapvote_highlight_border");

diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh
index e9778b795ce2e077cb7cef10023712b616743f74..0629c2a9f0dd17a7897c73f6ff68dc818748c4ac 100644 (file)
--- a/qcsrc/client/mutators/events.qh
+++ b/qcsrc/client/mutators/events.qh
@@ -170,12 +170,6 @@ MUTATOR_HOOKABLE(DrawScoreboard, EV_NO_ARGS);
        /**/
 MUTATOR_HOOKABLE(DrawInfoMessages, EV_DrawInfoMessages);
 
-/** Called when drawing info messages, allows adding new info messages */
-#define EV_HUD_WriteCvars(i, o) \
-       /** file */                     i(float, MUTATOR_ARGV_0_float) \
-       /**/
-MUTATOR_HOOKABLE(HUD_WriteCvars, EV_HUD_WriteCvars);
-
 /** Called when the view model is being animated (setorigin is called after the hook, so you only need to modify origin here if desired) */
 #define EV_DrawViewModel(i, o) \
        /** entity id */                i(entity, MUTATOR_ARGV_0_entity) \

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index a1d9a257788081c40182c099c6de9d1ca64233c1..0acdb0da59964e20c6900b5ff4532b953fb35652 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -10,22 +10,22 @@
 #include <client/hud/hud_config.qh>
 #include <client/mapvoting.qh>
 
-void HUD_MinigameBoard_Export(entity panel, int fh)
+void HUD_MinigameBoard_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }
 
-void HUD_MinigameStatus_Export(entity panel, int fh)
+void HUD_MinigameStatus_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }
 
-void HUD_MinigameHelp_Export(entity panel, int fh)
+void HUD_MinigameHelp_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }
 
-void HUD_MinigameMenu_Export(entity panel, int fh)
+void HUD_MinigameMenu_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
 }

diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
index 5ee7faae8494022623fd047dbdcf7f773ae7875c..78a5624c31b98bf74829377557fa7af956927944 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
@@ -187,7 +187,7 @@ MUTATOR_HOOKFUNCTION(itemstime, PlayerSpawn)
 
 // ItemsTime (#22)
 
-void HUD_ItemsTime_Export(entity panel, int fh)
+void HUD_ItemsTime_Export(int fh)
 {
        // allow saving cvars that aesthetically change the panel into hud skin files
        HUD_Write_Cvar("hud_panel_itemstime_iconalign");