From 0ed32bbddf11ada7d879e9b37e3997b744a270c8 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 1 Nov 2010 22:23:44 +0100 Subject: [PATCH] These autocvars... --- qcsrc/client/autocvars.qh | 120 -------------------------------------- qcsrc/client/hud.qc | 2 +- qcsrc/client/hud.qh | 22 +++---- 3 files changed, 12 insertions(+), 132 deletions(-) diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 74101dfa5..dabfe869c 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -42,171 +42,51 @@ var float autocvar_hud_panel_bg_padding; var float autocvar_hud_panel_fg_alpha; var float autocvar_hud_panel_weapons; -var vector autocvar_hud_panel_weapons_pos; -var vector autocvar_hud_panel_weapons_size; -var string autocvar_hud_panel_weapons_bg; -var string autocvar_hud_panel_weapons_bg_color; -var string autocvar_hud_panel_weapons_bg_color_team; -var string autocvar_hud_panel_weapons_bg_alpha; -var string autocvar_hud_panel_weapons_bg_border; -var string autocvar_hud_panel_weapons_bg_padding; var float autocvar_hud_panel_weapons_aspect; var float autocvar_hud_panel_ammo; -var vector autocvar_hud_panel_ammo_pos; -var vector autocvar_hud_panel_ammo_size; -var string autocvar_hud_panel_ammo_bg; -var string autocvar_hud_panel_ammo_bg_color; -var string autocvar_hud_panel_ammo_bg_color_team; -var string autocvar_hud_panel_ammo_bg_alpha; -var string autocvar_hud_panel_ammo_bg_border; -var string autocvar_hud_panel_ammo_bg_padding; var float autocvar_hud_panel_ammo_onlycurrent; var float autocvar_hud_panel_ammo_iconalign; var float autocvar_hud_panel_powerups; -var vector autocvar_hud_panel_powerups_pos; -var vector autocvar_hud_panel_powerups_size; -var string autocvar_hud_panel_powerups_bg; -var string autocvar_hud_panel_powerups_bg_color; -var string autocvar_hud_panel_powerups_bg_color_team; -var string autocvar_hud_panel_powerups_bg_alpha; -var string autocvar_hud_panel_powerups_bg_border; -var string autocvar_hud_panel_powerups_bg_padding; var float autocvar_hud_panel_powerups_flip; var float autocvar_hud_panel_powerups_iconalign; var float autocvar_hud_panel_powerups_baralign; var float autocvar_hud_panel_powerups_progressbar; var float autocvar_hud_panel_healtharmor; -var vector autocvar_hud_panel_healtharmor_pos; -var vector autocvar_hud_panel_healtharmor_size; -var string autocvar_hud_panel_healtharmor_bg; -var string autocvar_hud_panel_healtharmor_bg_color; -var string autocvar_hud_panel_healtharmor_bg_color_team; -var string autocvar_hud_panel_healtharmor_bg_alpha; -var string autocvar_hud_panel_healtharmor_bg_border; -var string autocvar_hud_panel_healtharmor_bg_padding; var float autocvar_hud_panel_healtharmor_flip; var float autocvar_hud_panel_healtharmor_iconalign; var float autocvar_hud_panel_healtharmor_baralign; var float autocvar_hud_panel_healtharmor_progressbar; var float autocvar_hud_panel_notify; -var vector autocvar_hud_panel_notify_pos; -var vector autocvar_hud_panel_notify_size; -var string autocvar_hud_panel_notify_bg; -var string autocvar_hud_panel_notify_bg_color; -var string autocvar_hud_panel_notify_bg_color_team; -var string autocvar_hud_panel_notify_bg_alpha; -var string autocvar_hud_panel_notify_bg_border; -var string autocvar_hud_panel_notify_bg_padding; var float autocvar_hud_panel_notify_print; var float autocvar_hud_panel_notify_time; var float autocvar_hud_panel_notify_fadetime; var float autocvar_hud_panel_notify_flip; var float autocvar_hud_panel_timer; -var vector autocvar_hud_panel_timer_pos; -var vector autocvar_hud_panel_timer_size; -var string autocvar_hud_panel_timer_bg; -var string autocvar_hud_panel_timer_bg_color; -var string autocvar_hud_panel_timer_bg_color_team; -var string autocvar_hud_panel_timer_bg_alpha; -var string autocvar_hud_panel_timer_bg_border; -var string autocvar_hud_panel_timer_bg_padding; var float autocvar_hud_panel_timer_increment; var float autocvar_hud_panel_radar; -var vector autocvar_hud_panel_radar_pos; -var vector autocvar_hud_panel_radar_size; -var string autocvar_hud_panel_radar_bg; -var string autocvar_hud_panel_radar_bg_color; -var string autocvar_hud_panel_radar_bg_color_team; -var string autocvar_hud_panel_radar_bg_alpha; -var string autocvar_hud_panel_radar_bg_border; -var string autocvar_hud_panel_radar_bg_padding; var float autocvar_hud_panel_score; -var vector autocvar_hud_panel_score_pos; -var vector autocvar_hud_panel_score_size; -var string autocvar_hud_panel_score_bg; -var string autocvar_hud_panel_score_bg_color; -var string autocvar_hud_panel_score_bg_color_team; -var string autocvar_hud_panel_score_bg_alpha; -var string autocvar_hud_panel_score_bg_border; -var string autocvar_hud_panel_score_bg_padding; var float autocvar_hud_panel_racetimer; -var vector autocvar_hud_panel_racetimer_pos; -var vector autocvar_hud_panel_racetimer_size; -var string autocvar_hud_panel_racetimer_bg; -var string autocvar_hud_panel_racetimer_bg_color; -var string autocvar_hud_panel_racetimer_bg_color_team; -var string autocvar_hud_panel_racetimer_bg_alpha; -var string autocvar_hud_panel_racetimer_bg_border; -var string autocvar_hud_panel_racetimer_bg_padding; var float autocvar_hud_panel_vote; -var vector autocvar_hud_panel_vote_pos; -var vector autocvar_hud_panel_vote_size; -var string autocvar_hud_panel_vote_bg; -var string autocvar_hud_panel_vote_bg_color; -var string autocvar_hud_panel_vote_bg_color_team; -var string autocvar_hud_panel_vote_bg_alpha; -var string autocvar_hud_panel_vote_bg_border; -var string autocvar_hud_panel_vote_bg_padding; var float autocvar_hud_panel_modicons; -var vector autocvar_hud_panel_modicons_pos; -var vector autocvar_hud_panel_modicons_size; -var string autocvar_hud_panel_modicons_bg; -var string autocvar_hud_panel_modicons_bg_color; -var string autocvar_hud_panel_modicons_bg_color_team; -var string autocvar_hud_panel_modicons_bg_alpha; -var string autocvar_hud_panel_modicons_bg_border; -var string autocvar_hud_panel_modicons_bg_padding; var float autocvar_hud_panel_pressedkeys; -var vector autocvar_hud_panel_pressedkeys_pos; -var vector autocvar_hud_panel_pressedkeys_size; -var string autocvar_hud_panel_pressedkeys_bg; -var string autocvar_hud_panel_pressedkeys_bg_color; -var string autocvar_hud_panel_pressedkeys_bg_color_team; -var string autocvar_hud_panel_pressedkeys_bg_alpha; -var string autocvar_hud_panel_pressedkeys_bg_border; -var string autocvar_hud_panel_pressedkeys_bg_padding; var float autocvar_hud_panel_pressedkeys_aspect; var float autocvar_hud_panel_chat; -var vector autocvar_hud_panel_chat_pos; -var vector autocvar_hud_panel_chat_size; -var string autocvar_hud_panel_chat_bg; -var string autocvar_hud_panel_chat_bg_color; -var string autocvar_hud_panel_chat_bg_color_team; -var string autocvar_hud_panel_chat_bg_alpha; -var string autocvar_hud_panel_chat_bg_border; -var string autocvar_hud_panel_chat_bg_padding; var float autocvar_hud_panel_engineinfo; -var vector autocvar_hud_panel_engineinfo_pos; -var vector autocvar_hud_panel_engineinfo_size; -var string autocvar_hud_panel_engineinfo_bg; -var string autocvar_hud_panel_engineinfo_bg_color; -var string autocvar_hud_panel_engineinfo_bg_color_team; -var string autocvar_hud_panel_engineinfo_bg_alpha; -var string autocvar_hud_panel_engineinfo_bg_border; -var string autocvar_hud_panel_engineinfo_bg_padding; var float autocvar_hud_panel_infomessages; -var vector autocvar_hud_panel_infomessages_pos; -var vector autocvar_hud_panel_infomessages_size; -var string autocvar_hud_panel_infomessages_bg; -var string autocvar_hud_panel_infomessages_bg_color; -var string autocvar_hud_panel_infomessages_bg_color_team; -var string autocvar_hud_panel_infomessages_bg_alpha; -var string autocvar_hud_panel_infomessages_bg_border; -var string autocvar_hud_panel_infomessages_bg_padding; var float autocvar_hud_panel_infomessages_flip; var float autocvar_scoreboard_border_thickness; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index dbffe8de1..116266532 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -3769,7 +3769,7 @@ void HUD_VoteWindow(void) if(!autocvar__hud_configure) { panel_fg_alpha = autocvar_hud_panel_fg_alpha; - panel_bg_alpha_str = autocvar_hud_panel_vote_bg_alpha; + panel_bg_alpha_str = cvar_string("hud_panel_vote_bg_alpha"); if(panel_bg_alpha_str == "") { panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha); diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index c1939332c..328a59036 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -251,14 +251,14 @@ else\ // Update all common cvars of given panel name #define HUD_Panel_UpdateCvars(name) \ panel_enabled = autocvar_hud_panel_##name; \ -panel_pos = autocvar_hud_panel_##name##_pos; \ -panel_size = autocvar_hud_panel_##name##_size; \ -panel_bg_str = autocvar_hud_panel_##name##_bg; \ -panel_bg_color_str = autocvar_hud_panel_##name##_bg_color; \ -panel_bg_color_team_str = autocvar_hud_panel_##name##_bg_color_team; \ -panel_bg_alpha_str = autocvar_hud_panel_##name##_bg_alpha; \ -panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \ -panel_bg_padding_str = autocvar_hud_panel_##name##_bg_padding; \ +panel_pos = stov(cvar_string("hud_panel_" #name "_pos")); \ +panel_size = stov(cvar_string("hud_panel_" #name "_size")); \ +panel_bg_str = cvar_string("hud_panel_" #name "_bg"); \ +panel_bg_color_str = cvar_string("hud_panel_" #name "_bg_color"); \ +panel_bg_color_team_str = cvar_string("hud_panel_" #name "_bg_color_team"); \ +panel_bg_alpha_str = cvar_string("hud_panel_" #name "_bg_alpha"); \ +panel_bg_border_str = cvar_string("hud_panel_" #name "_bg_border"); \ +panel_bg_padding_str = cvar_string("hud_panel_" #name "_bg_padding"); \ HUD_Panel_StringVars()\ if(menu_enabled == 2 && active_panel == highlightedPanel) {\ HUD_Panel_GetMenuSize()\ @@ -286,14 +286,14 @@ switch(id) { \ } #define HUD_Panel_UpdatePosSize(name) \ -panel_pos = autocvar_hud_panel_##name##_pos; \ -panel_size = autocvar_hud_panel_##name##_size; \ +panel_pos = stov(cvar_string("hud_panel_" #name "_pos")); \ +panel_size = stov(cvar_string("hud_panel_" #name "_size")); \ HUD_Panel_GetScaledVectors()\ if(menu_enabled == 2 && active_panel == highlightedPanel) {\ HUD_Panel_GetMenuSize()\ HUD_Panel_GetMenuPos()\ }\ -panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \ +panel_bg_border_str = cvar_string("hud_panel_" #name "_bg_border"); \ HUD_Panel_GetBorder() // Update pos and size of given panel id -- 2.39.2