From 126111bb9ef1d8979a6b76bcf464f6e19ea1168d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 26 Oct 2020 17:31:56 +1000 Subject: [PATCH] Purge autocvars.qh from the client-side codebase, cvars are defined in the headers of the features that use them --- qcsrc/client/announcer.qh | 4 + qcsrc/client/autocvars.qh | 514 +----------------- qcsrc/client/bgmscript.qc | 1 - qcsrc/client/bgmscript.qh | 2 + qcsrc/client/command/cl_cmd.qc | 1 - qcsrc/client/csqcmodel_hooks.qc | 1 - qcsrc/client/csqcmodel_hooks.qh | 17 + qcsrc/client/hud/crosshair.qc | 1 - qcsrc/client/hud/crosshair.qh | 58 ++ qcsrc/client/hud/hud.qc | 1 + qcsrc/client/hud/hud.qh | 20 + qcsrc/client/hud/hud_config.qc | 2 +- qcsrc/client/hud/hud_config.qh | 6 + qcsrc/client/hud/panel/ammo.qc | 1 - qcsrc/client/hud/panel/ammo.qh | 13 + qcsrc/client/hud/panel/centerprint.qh | 17 + qcsrc/client/hud/panel/chat.qc | 1 - qcsrc/client/hud/panel/chat.qh | 9 + qcsrc/client/hud/panel/engineinfo.qc | 1 - qcsrc/client/hud/panel/engineinfo.qh | 5 + qcsrc/client/hud/panel/healtharmor.qh | 23 + qcsrc/client/hud/panel/infomessages.qc | 1 - qcsrc/client/hud/panel/infomessages.qh | 6 + qcsrc/client/hud/panel/modicons.qc | 1 - qcsrc/client/hud/panel/modicons.qh | 3 + qcsrc/client/hud/panel/notify.qc | 1 - qcsrc/client/hud/panel/notify.qh | 9 + qcsrc/client/hud/panel/physics.qc | 1 - qcsrc/client/hud/panel/physics.qh | 25 + qcsrc/client/hud/panel/powerups.qc | 1 - qcsrc/client/hud/panel/powerups.qh | 12 + qcsrc/client/hud/panel/pressedkeys.qc | 1 - qcsrc/client/hud/panel/pressedkeys.qh | 5 + qcsrc/client/hud/panel/quickmenu.qc | 1 - qcsrc/client/hud/panel/quickmenu.qh | 6 + qcsrc/client/hud/panel/racetimer.qc | 1 - qcsrc/client/hud/panel/racetimer.qh | 3 + qcsrc/client/hud/panel/radar.qc | 1 - qcsrc/client/hud/panel/radar.qh | 11 + qcsrc/client/hud/panel/score.qc | 1 - qcsrc/client/hud/panel/score.qh | 4 + qcsrc/client/hud/panel/scoreboard.qc | 2 +- qcsrc/client/hud/panel/scoreboard.qh | 3 + qcsrc/client/hud/panel/strafehud.qc | 2 +- qcsrc/client/hud/panel/strafehud.qh | 49 ++ qcsrc/client/hud/panel/timer.qc | 1 - qcsrc/client/hud/panel/timer.qh | 4 + qcsrc/client/hud/panel/vote.qc | 1 - qcsrc/client/hud/panel/vote.qh | 6 + qcsrc/client/hud/panel/weapons.qc | 1 - qcsrc/client/hud/panel/weapons.qh | 39 ++ qcsrc/client/main.qh | 17 + qcsrc/client/mapvoting.qc | 1 - qcsrc/client/mapvoting.qh | 5 + qcsrc/client/shownames.qc | 1 - qcsrc/client/shownames.qh | 20 + qcsrc/client/teamradar.qc | 2 +- qcsrc/client/view.qc | 1 - qcsrc/client/view.qh | 90 +++ qcsrc/client/weapons/projectile.qc | 1 - qcsrc/client/weapons/projectile.qh | 2 + qcsrc/common/effects/qc/casings.qh | 8 + qcsrc/common/effects/qc/damageeffects.qh | 8 + qcsrc/common/effects/qc/gibs.qh | 20 + qcsrc/common/effects/qc/lightningarc.qh | 9 + .../gamemode/clanarena/cl_clanarena.qh | 2 + qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc | 1 + .../gamemode/freezetag/cl_freezetag.qh | 2 + .../gamemodes/gamemode/nexball/cl_nexball.qh | 2 + .../common/gamemodes/gamemode/race/cl_race.qh | 3 + qcsrc/common/minigames/cl_minigames_hud.qc | 2 +- .../mutators/mutator/itemstime/itemstime.qc | 1 + .../mutator/waypoints/waypointsprites.qh | 2 + qcsrc/common/notifications/all.qh | 4 - qcsrc/common/util.qh | 2 + qcsrc/common/vehicles/cl_vehicles.qh | 10 + qcsrc/common/weapons/all.qc | 1 - qcsrc/common/weapons/weapon/vortex.qh | 4 + qcsrc/lib/csqcmodel/interpolate.qh | 2 + qcsrc/lib/warpzone/client.qc | 1 - qcsrc/server/autocvars.qh | 1 - 81 files changed, 586 insertions(+), 539 deletions(-) diff --git a/qcsrc/client/announcer.qh b/qcsrc/client/announcer.qh index c7c0eb0259..897a7bb670 100644 --- a/qcsrc/client/announcer.qh +++ b/qcsrc/client/announcer.qh @@ -1,5 +1,9 @@ #pragma once +string autocvar_cl_announcer; +float autocvar_cl_announcer_antispam = 2; +float autocvar_cl_announcer_maptime = 3; + void Announcer(); string AnnouncerOption(); diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 967f8e4434..59d3a3124d 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -1,505 +1,13 @@ #pragma once -bool autocvar__con_chat_maximized; -bool autocvar__hud_configure; -string autocvar__hud_panelorder; -float autocvar__menu_alpha; -string autocvar_accuracy_color_levels; -float autocvar_bgmvolume; -bool autocvar_camera_chase_smoothly; -bool autocvar_camera_enable; -bool autocvar_camera_forward_follows; -bool autocvar_camera_free; -float autocvar_camera_look_attenuation; -float autocvar_camera_look_player; -float autocvar_camera_mouse_threshold; -bool autocvar_camera_reset; -float autocvar_camera_speed_attenuation; -float autocvar_camera_speed_chase; -float autocvar_camera_speed_free; -float autocvar_camera_speed_roll; -int autocvar_chase_active; -int autocvar_cl_allow_uid2name; -string autocvar_cl_announcer; -float autocvar_cl_announcer_antispam = 2; -float autocvar_cl_announcer_maptime = 3; -bool autocvar_cl_autodemo_delete; -bool autocvar_cl_autodemo_delete_keeprecords; -float autocvar_cl_casings_bronze_time; -int autocvar_cl_casings_maxcount = 100; -float autocvar_cl_casings_shell_time; -bool autocvar_cl_casings_sloppy = 1; -float autocvar_cl_casings_ticrate = 0.1; -bool autocvar_cl_db_saveasdump; -bool autocvar_cl_deathscoreboard; -float autocvar_cl_effects_lightningarc_branchfactor_add; -float autocvar_cl_effects_lightningarc_branchfactor_start; -float autocvar_cl_effects_lightningarc_drift_end; -float autocvar_cl_effects_lightningarc_drift_start; -float autocvar_cl_effects_lightningarc_segmentlength; -bool autocvar_cl_effects_lightningarc_simple; -bool autocvar_cl_gentle; -int autocvar_cl_gentle_damage; -int autocvar_cl_gentle_gibs; -int autocvar_cl_gentle_messages; -float autocvar_cl_gibs_damageforcescale = 3.5; -float autocvar_cl_gibs_lifetime = 14; -int autocvar_cl_gibs_maxcount = 100; -bool autocvar_cl_gibs_sloppy = 1; -float autocvar_cl_gibs_ticrate = 0.1; -float autocvar_cl_gibs_velocity_random = 1; -float autocvar_cl_gibs_velocity_scale = 1; -float autocvar_cl_gibs_avelocity_scale = 1; -float autocvar_cl_gibs_velocity_up; -bool autocvar_cl_hidewaypoints; -bool autocvar_cl_lockview; -bool autocvar_cl_nogibs; -bool autocvar_cl_orthoview; -bool autocvar_cl_orthoview_nofog; -bool autocvar_cl_particlegibs; -bool autocvar_cl_particles_oldvortexbeam; -float autocvar_cl_particles_quality; -bool autocvar_cl_projectiles_sloppy; -bool autocvar_cl_readpicture_force; -bool autocvar_cl_respawn_ghosts_keepcolors; -bool autocvar_cl_reticle = 1; -float autocvar_cl_reticle_normal_alpha = 1; -bool autocvar_cl_reticle_weapon = 1; -float autocvar_cl_reticle_weapon_alpha = 1; -bool autocvar_cl_reticle_stretch; -bool autocvar_cl_spawn_event_particles; -bool autocvar_cl_spawn_event_sound = 1; -// float autocvar_cl_spawn_point_model; -bool autocvar_cl_spawn_point_particles; -float autocvar_cl_spawn_point_dist_max = 1200; -bool autocvar_cl_spawnzoom = 1; -float autocvar_cl_spawnzoom_speed = 1; -float autocvar_cl_spawnzoom_factor = 2; -bool autocvar_cl_stripcolorcodes; -bool autocvar_cl_vehicles_alarm = false; -bool autocvar_cl_vehicles_hud_tactical = true; -float autocvar_cl_vehicles_hudscale = 0.5; -float autocvar_cl_vehicles_notify_time = 15; -float autocvar_cl_vehicles_crosshair_size = 0.5; -bool autocvar_cl_vehicles_crosshair_colorize = true; -bool autocvar__vehicles_shownchasemessage; -bool autocvar_cl_velocityzoom_enabled; -float autocvar_cl_velocityzoom_factor; -int autocvar_cl_velocityzoom_type = 3; -float autocvar_cl_velocityzoom_speed; -float autocvar_cl_velocityzoom_time; -string autocvar_cl_weaponpriority; -float autocvar_cl_zoomfactor; -float autocvar_cl_zoomsensitivity; -float autocvar_cl_zoomspeed; -bool autocvar_cl_unpress_zoom_on_spawn = true; -bool autocvar_cl_unpress_zoom_on_death = true; -bool autocvar_cl_unpress_zoom_on_weapon_switch = true; -bool autocvar_cl_unpress_attack_on_weapon_switch = false; -bool autocvar_con_chat; -bool autocvar_con_chatrect; -float autocvar_con_chatsize; -float autocvar_con_notify; -float autocvar_con_notifysize; -string autocvar_crosshair; -string autocvar_crosshair_2d = "54"; -float autocvar_crosshair_alpha; -string autocvar_crosshair_color; -int autocvar_crosshair_color_special; -float autocvar_crosshair_color_special_rainbow_brightness = 2; -float autocvar_crosshair_color_special_rainbow_delay = 0.1; -bool autocvar_crosshair_dot; -float autocvar_crosshair_dot_alpha; -string autocvar_crosshair_dot_color; -bool autocvar_crosshair_dot_color_custom = 1; -float autocvar_crosshair_dot_size; -bool autocvar_crosshair_effect_scalefade; -float autocvar_crosshair_effect_time = 0.2; -bool autocvar_crosshair_enabled = 1; -bool autocvar_crosshair_hitindication; -string autocvar_crosshair_hitindication_color; -string autocvar_crosshair_hitindication_per_weapon_color; -float autocvar_crosshair_hitindication_speed; -bool autocvar_crosshair_hittest; -bool autocvar_crosshair_hittest_blur_teammate = 0; -bool autocvar_crosshair_hittest_blur_wall = 1; -//float autocvar_crosshair_hittest_scale = 1.25; -bool autocvar_crosshair_hittest_showimpact; -bool autocvar_crosshair_per_weapon; -float autocvar_crosshair_pickup; -float autocvar_crosshair_pickup_speed; -bool autocvar_crosshair_ring; -bool autocvar_crosshair_ring_inner; -bool autocvar_crosshair_ring_minelayer; -float autocvar_crosshair_ring_minelayer_alpha; -bool autocvar_crosshair_ring_hagar; -float autocvar_crosshair_ring_hagar_alpha; -bool autocvar_crosshair_ring_vortex = 1; -float autocvar_crosshair_ring_vortex_alpha = 0.15; -float autocvar_crosshair_ring_vortex_currentcharge_movingavg_rate = 0.05; -float autocvar_crosshair_ring_vortex_currentcharge_scale = 30; -float autocvar_crosshair_ring_vortex_inner_alpha = 0.15; -float autocvar_crosshair_ring_vortex_inner_color_blue = 0; -float autocvar_crosshair_ring_vortex_inner_color_green = 0; -float autocvar_crosshair_ring_vortex_inner_color_red = 0.8; -bool autocvar_crosshair_ring_arc = 1; -vector autocvar_crosshair_ring_arc_hot_color = '1 0 0'; -float autocvar_crosshair_ring_arc_cold_alpha = 0.2; -float autocvar_crosshair_ring_arc_hot_alpha = 0.5; -float autocvar_crosshair_ring_size; -bool autocvar_crosshair_ring_reload; -float autocvar_crosshair_ring_reload_alpha; -float autocvar_crosshair_ring_reload_size; -float autocvar_crosshair_size; -bool autocvar_crosshair_chase = true; -float autocvar_crosshair_chase_playeralpha = 0.25; -int autocvar_ekg; -float autocvar_fov; -bool autocvar_hud_cursormode = true; -float autocvar_hud_colorflash_alpha; -bool autocvar_hud_configure_checkcollisions; -bool autocvar_hud_configure_grid; -float autocvar_hud_configure_grid_alpha; -bool autocvar_hud_configure_teamcolorforced; -bool autocvar_hud_contents; -float autocvar_hud_contents_blur; -float autocvar_hud_contents_blur_alpha; -float autocvar_hud_contents_fadeintime; -float autocvar_hud_contents_fadeouttime; -float autocvar_hud_contents_lava_alpha; -string autocvar_hud_contents_lava_color; -float autocvar_hud_contents_slime_alpha; -string autocvar_hud_contents_slime_color; -float autocvar_hud_contents_water_alpha; -string autocvar_hud_contents_water_color; -bool autocvar_hud_damage; -float autocvar_hud_damage_blur; -float autocvar_hud_damage_blur_alpha; -string autocvar_hud_damage_color; -float autocvar_hud_damage_factor; -float autocvar_hud_damage_fade_rate; -float autocvar_hud_damage_gentle_alpha_multiplier; -string autocvar_hud_damage_gentle_color; -float autocvar_hud_damage_maxalpha; -float autocvar_hud_damage_pain_threshold; -float autocvar_hud_damage_pain_threshold_lower; -float autocvar_hud_damage_pain_threshold_lower_health; -float autocvar_hud_damage_pain_threshold_pulsating_min; -float autocvar_hud_damage_pain_threshold_pulsating_period; -bool autocvar_hud_powerup; -bool autocvar_hud_postprocessing; -float autocvar_hud_postprocessing_maxbluralpha; -float autocvar_hud_postprocessing_maxblurradius; -string autocvar_hud_dock; -float autocvar_hud_dock_alpha; -string autocvar_hud_dock_color; -bool autocvar_hud_dock_color_team; -bool autocvar_hud_panel_weapons_dynamichud = true; -bool autocvar_hud_panel_ammo_dynamichud = true; -bool autocvar_hud_panel_powerups_dynamichud = true; -bool autocvar_hud_panel_healtharmor_dynamichud = true; -bool autocvar_hud_panel_notify_dynamichud = true; -bool autocvar_hud_panel_timer_dynamichud = true; -bool autocvar_hud_panel_radar_dynamichud = true; -bool autocvar_hud_panel_score_dynamichud = true; -bool autocvar_hud_panel_racetimer_dynamichud = true; -bool autocvar_hud_panel_vote_dynamichud = true; -bool autocvar_hud_panel_modicons_dynamichud = true; -bool autocvar_hud_panel_pressedkeys_dynamichud = true; -bool autocvar_hud_panel_engineinfo_dynamichud = true; -bool autocvar_hud_panel_infomessages_dynamichud = false; -bool autocvar_hud_panel_physics_dynamichud = true; -bool autocvar_hud_panel_centerprint_dynamichud = true; -//bool autocvar_hud_panel_itemstime_dynamichud = true; -bool autocvar_hud_panel_strafehud_dynamichud = true; -bool autocvar_hud_panel_healtharmor_hide_ondeath = false; -bool autocvar_hud_panel_ammo_hide_ondeath = false; -bool autocvar_hud_panel_powerups_hide_ondeath = false; -bool autocvar_hud_panel_weapons_hide_ondeath = false; -bool autocvar_hud_panel_ammo; -bool autocvar_hud_panel_ammo_iconalign; -int autocvar_hud_panel_ammo_maxammo; -bool autocvar_hud_panel_ammo_onlycurrent; -float autocvar_hud_panel_ammo_noncurrent_alpha = 0.7; -float autocvar_hud_panel_ammo_noncurrent_scale = 1; -bool autocvar_hud_panel_ammo_progressbar; -string autocvar_hud_panel_ammo_progressbar_name; -float autocvar_hud_panel_ammo_progressbar_xoffset; -bool autocvar_hud_panel_ammo_text; -string autocvar_hud_panel_bg; -float autocvar_hud_panel_bg_alpha; -float autocvar_hud_panel_bg_border; -vector autocvar_hud_panel_bg_color; -float autocvar_hud_panel_bg_color_team; -float autocvar_hud_panel_bg_padding; -bool autocvar_hud_panel_centerprint; -float autocvar_hud_panel_centerprint_align; -float autocvar_hud_panel_centerprint_fade_in = 0.2; -float autocvar_hud_panel_centerprint_fade_out = 0.5; -float autocvar_hud_panel_centerprint_fade_subsequent = 1; -float autocvar_hud_panel_centerprint_fade_subsequent_passone = 3; -float autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha = 0.5; -float autocvar_hud_panel_centerprint_fade_subsequent_passtwo = 10; -float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5; -float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75; -float autocvar_hud_panel_centerprint_fade_minfontsize = 0; -bool autocvar_hud_panel_centerprint_flip; -float autocvar_hud_panel_centerprint_fontscale; -float autocvar_hud_panel_centerprint_fontscale_bold = 1.4; -float autocvar_hud_panel_centerprint_time; -bool autocvar_hud_panel_chat; -bool autocvar_hud_panel_engineinfo; -float autocvar_hud_panel_engineinfo_framecounter_decimals; -float autocvar_hud_panel_engineinfo_framecounter_time; -float autocvar_hud_panel_fg_alpha; -bool autocvar_hud_panel_healtharmor; -int autocvar_hud_panel_healtharmor_baralign; -bool autocvar_hud_panel_healtharmor_combined; -bool autocvar_hud_panel_healtharmor_flip; -int autocvar_hud_panel_healtharmor_iconalign; -int autocvar_hud_panel_healtharmor_maxarmor; -int autocvar_hud_panel_healtharmor_maxhealth; -bool autocvar_hud_panel_healtharmor_progressbar; -string autocvar_hud_panel_healtharmor_progressbar_armor; -string autocvar_hud_panel_healtharmor_progressbar_health; -bool autocvar_hud_panel_healtharmor_progressbar_gfx; -float autocvar_hud_panel_healtharmor_progressbar_gfx_damage; -float autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth; -float autocvar_hud_panel_healtharmor_progressbar_gfx_smooth; -int autocvar_hud_panel_healtharmor_text; -bool autocvar_hud_panel_infomessages; -bool autocvar_hud_panel_infomessages_flip; -float autocvar_hud_panel_mapvote_highlight_border = 1; -bool autocvar_hud_panel_modicons; -int autocvar_hud_panel_modicons_ca_layout; -int autocvar_hud_panel_modicons_freezetag_layout; -bool autocvar_hud_panel_notify; -float autocvar_hud_panel_notify_fadetime; -float autocvar_hud_panel_notify_flip; -float autocvar_hud_panel_notify_fontsize; -float autocvar_hud_panel_notify_time; -float autocvar_hud_panel_notify_icon_aspect; -bool autocvar_hud_panel_physics; -float autocvar_hud_panel_physics_acceleration_movingaverage = 1; -float autocvar_hud_panel_physics_acceleration_progressbar_mode; -float autocvar_hud_panel_physics_acceleration_progressbar_scale; -float autocvar_hud_panel_physics_acceleration_progressbar_nonlinear; -float autocvar_hud_panel_physics_acceleration_max; -float autocvar_hud_panel_physics_update_interval; -int autocvar_hud_panel_physics_progressbar; -bool autocvar_hud_panel_physics_acceleration_vertical; -int autocvar_hud_panel_physics_baralign; -bool autocvar_hud_panel_physics_flip; -float autocvar_hud_panel_physics_speed_max; -int autocvar_hud_panel_physics_speed_unit; -bool autocvar_hud_panel_physics_speed_unit_show; -bool autocvar_hud_panel_physics_speed_vertical; -int autocvar_hud_panel_physics_text; -float autocvar_hud_panel_physics_text_scale; -bool autocvar_hud_panel_physics_topspeed; -float autocvar_hud_panel_physics_topspeed_time; -bool autocvar_hud_panel_powerups; -int autocvar_hud_panel_powerups_baralign; -int autocvar_hud_panel_powerups_iconalign; -bool autocvar_hud_panel_powerups_progressbar; -bool autocvar_hud_panel_powerups_text; -int autocvar_hud_panel_pressedkeys; -float autocvar_hud_panel_pressedkeys_aspect; -bool autocvar_hud_panel_pressedkeys_attack; -float autocvar_hud_panel_quickmenu_translatecommands; -string autocvar_hud_panel_quickmenu_file; -float autocvar_hud_panel_quickmenu_time; -bool autocvar_hud_panel_racetimer; -int autocvar_hud_panel_radar; -float autocvar_hud_panel_radar_foreground_alpha; -float autocvar_hud_panel_radar_maximized_scale; -vector autocvar_hud_panel_radar_maximized_size; -float autocvar_hud_panel_radar_rotation; -float autocvar_hud_panel_radar_scale; -int autocvar_hud_panel_radar_zoommode; -float autocvar_hud_panel_radar_maximized_rotation; -int autocvar_hud_panel_radar_maximized_zoommode; -bool autocvar_hud_panel_score; -bool autocvar_hud_panel_score_rankings; -int autocvar_hud_panel_strafehud = 3; -bool autocvar__hud_panel_strafehud_demo = false; -int autocvar_hud_panel_strafehud_mode = 0; -float autocvar_hud_panel_strafehud_range = 0; -int autocvar_hud_panel_strafehud_style = 1; -int autocvar_hud_panel_strafehud_unit = 1; -bool autocvar_hud_panel_strafehud_unit_show = true; -vector autocvar_hud_panel_strafehud_bar_neutral_color = '1 1 1'; -float autocvar_hud_panel_strafehud_bar_neutral_alpha = 0.3; -vector autocvar_hud_panel_strafehud_bar_accel_color = '0 1 0'; -float autocvar_hud_panel_strafehud_bar_accel_alpha = 0.3; -vector autocvar_hud_panel_strafehud_bar_overturn_color = '1 0 1'; -float autocvar_hud_panel_strafehud_bar_overturn_alpha = 0.3; -float autocvar_hud_panel_strafehud_angle_alpha = 0.8; -float autocvar_hud_panel_strafehud_angle_height = 1.5; -float autocvar_hud_panel_strafehud_angle_width = 0.005; -vector autocvar_hud_panel_strafehud_angle_neutral_color = '1 1 0'; -vector autocvar_hud_panel_strafehud_angle_accel_color = '0 1 1'; -vector autocvar_hud_panel_strafehud_angle_overturn_color = '1 0 1'; -float autocvar_hud_panel_strafehud_switch_minspeed = -1; -vector autocvar_hud_panel_strafehud_switch_active_color = '0 1 0'; -float autocvar_hud_panel_strafehud_switch_active_alpha = 1; -vector autocvar_hud_panel_strafehud_switch_inactive_color = '1 1 0'; -float autocvar_hud_panel_strafehud_switch_inactive_alpha = 1; -float autocvar_hud_panel_strafehud_switch_width = 0.0075; -vector autocvar_hud_panel_strafehud_direction_color = '0 0.5 1'; -float autocvar_hud_panel_strafehud_direction_alpha = 1; -float autocvar_hud_panel_strafehud_direction_width = 0.25; -float autocvar_hud_panel_strafehud_direction_length = 0.02; -float autocvar_hud_panel_strafehud_slickdetector_range = 0; -int autocvar_hud_panel_strafehud_slickdetector_granularity = 2; -vector autocvar_hud_panel_strafehud_slickdetector_color = '0 1 1'; -float autocvar_hud_panel_strafehud_slickdetector_alpha = 0.5; -float autocvar_hud_panel_strafehud_slickdetector_height = 0.125; -float autocvar_hud_panel_strafehud_startspeed_fade = 0; -vector autocvar_hud_panel_strafehud_startspeed_color = '1 0.75 0'; -float autocvar_hud_panel_strafehud_startspeed_size = 1.5; -float autocvar_hud_panel_strafehud_jumpheight_fade = 0; -float autocvar_hud_panel_strafehud_jumpheight_min = 50; -vector autocvar_hud_panel_strafehud_jumpheight_color = '0 1 0.75'; -float autocvar_hud_panel_strafehud_jumpheight_size = 1.5; -float autocvar_hud_panel_strafehud_timeout_air = 0.1; -float autocvar_hud_panel_strafehud_timeout_ground = 0.03333333; -float autocvar_hud_panel_strafehud_timeout_turn = 0.1; -float autocvar_hud_panel_strafehud_timeout_direction = 0.5; -float autocvar_hud_panel_strafehud_antiflicker_angle = 0.01; -float autocvar_hud_panel_strafehud_antiflicker_speed = 0.0001; -bool autocvar_hud_panel_timer; -bool autocvar_hud_panel_timer_increment; -float autocvar_hud_panel_update_interval; -bool autocvar_hud_panel_vote; -float autocvar_hud_panel_vote_alreadyvoted_alpha; -bool autocvar_hud_panel_weapons; -bool autocvar_hud_panel_weapons_accuracy; -bool autocvar_hud_panel_weapons_ammo; -float autocvar_hud_panel_weapons_ammo_alpha; -string autocvar_hud_panel_weapons_ammo_color; -int autocvar_hud_panel_weapons_ammo_full_cells; -int autocvar_hud_panel_weapons_ammo_full_plasma; -int autocvar_hud_panel_weapons_ammo_full_fuel; -int autocvar_hud_panel_weapons_ammo_full_nails; -int autocvar_hud_panel_weapons_ammo_full_rockets; -int autocvar_hud_panel_weapons_ammo_full_shells; -float autocvar_hud_panel_weapons_aspect; -bool autocvar_hud_panel_weapons_complainbubble; -string autocvar_hud_panel_weapons_complainbubble_color_donthave; -string autocvar_hud_panel_weapons_complainbubble_color_outofammo; -string autocvar_hud_panel_weapons_complainbubble_color_unavailable; -float autocvar_hud_panel_weapons_complainbubble_fadetime; -float autocvar_hud_panel_weapons_complainbubble_padding; -float autocvar_hud_panel_weapons_complainbubble_time; -int autocvar_hud_panel_weapons_label; -float autocvar_hud_panel_weapons_label_scale = 0.5; -int autocvar_hud_panel_weapons_onlyowned; -float autocvar_hud_panel_weapons_noncurrent_alpha = 1; -float autocvar_hud_panel_weapons_noncurrent_scale = 1; -float autocvar_hud_panel_weapons_selection_radius = 0; -float autocvar_hud_panel_weapons_selection_speed = 10; -float autocvar_hud_panel_weapons_timeout; -int autocvar_hud_panel_weapons_timeout_effect; -bool autocvar_hud_panel_weapons_orderbyimpulse = true; -float autocvar_hud_panel_weapons_timeout_fadebgmin; -float autocvar_hud_panel_weapons_timeout_fadefgmin; -float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; -float autocvar_hud_panel_weapons_timeout_speed_out = 0.75; -//float autocvar_hud_panel_quickmenu; -float autocvar_hud_panel_quickmenu_align; -vector autocvar_hud_progressbar_acceleration_color; -vector autocvar_hud_progressbar_acceleration_neg_color; -float autocvar_hud_progressbar_alpha; -vector autocvar_hud_progressbar_armor_color; -vector autocvar_hud_progressbar_fuel_color; -vector autocvar_hud_progressbar_oxygen_color = '0.1 1 1'; -vector autocvar_hud_progressbar_health_color; -vector autocvar_hud_progressbar_nexball_color; -vector autocvar_hud_progressbar_shield_color; -vector autocvar_hud_progressbar_speed_color; -vector autocvar_hud_progressbar_strength_color; -vector autocvar_hud_progressbar_superweapons_color; -vector autocvar_hud_progressbar_vehicles_ammo1_color; -vector autocvar_hud_progressbar_vehicles_ammo2_color; -bool autocvar_hud_showbinds; -bool autocvar_hud_showbinds_limit; -bool autocvar__hud_showbinds_reload; -bool autocvar_hud_shownames; -bool autocvar_hud_shownames_enemies; -float autocvar_hud_shownames_crosshairdistance; -float autocvar_hud_shownames_crosshairdistance_time; -float autocvar_hud_shownames_crosshairdistance_antioverlap; -bool autocvar_hud_shownames_self; -bool autocvar_hud_shownames_status; -float autocvar_hud_shownames_statusbar_height; -float autocvar_hud_shownames_statusbar_highlight = 1; -float autocvar_hud_shownames_aspect; -float autocvar_hud_shownames_fontsize; -int autocvar_hud_shownames_decolorize; -float autocvar_hud_shownames_alpha; -bool autocvar_hud_shownames_resize; -float autocvar_hud_shownames_mindistance; -float autocvar_hud_shownames_maxdistance; -bool autocvar_hud_shownames_antioverlap; -float autocvar_hud_shownames_antioverlap_distance; -float autocvar_hud_shownames_offset; -string autocvar_hud_skin; -float autocvar_menu_mouse_speed; -string autocvar_menu_skin; -int autocvar_r_fakelight; -bool autocvar_r_fullbright; -float autocvar_r_letterbox; -string autocvar_scoreboard_columns; -bool autocvar_v_flipped; -int autocvar_vid_conheight; -int autocvar_vid_conwidth; -float autocvar_vid_pixelheight; -float autocvar_viewsize; -bool autocvar_cl_eventchase_vehicle = 1; -vector autocvar_cl_eventchase_vehicle_viewoffset = '0 0 80'; -float autocvar_cl_eventchase_vehicle_distance = 250; -int autocvar_cl_hitsound; -float autocvar_cl_hitsound_min_pitch = 0.75; -float autocvar_cl_hitsound_max_pitch = 1.5; -float autocvar_cl_hitsound_nom_damage = 25; -float autocvar_cl_hitsound_antispam_time; -bool autocvar_cl_eventchase_spectated_change = false; -float autocvar_cl_eventchase_spectated_change_time = 1; -int autocvar_cl_eventchase_death = 2; -float autocvar_cl_eventchase_distance = 140; -bool autocvar_cl_eventchase_frozen = false; -float autocvar_cl_eventchase_speed = 1.3; -vector autocvar_cl_eventchase_maxs = '12 12 8'; -vector autocvar_cl_eventchase_mins = '-12 -12 -8'; -vector autocvar_cl_eventchase_viewoffset = '0 0 20'; -float autocvar_cl_lerpexcess; // TODO: int? -string autocvar__togglezoom; -int autocvar_cl_damageeffect; -float autocvar_cl_damageeffect_ticrate; -float autocvar_cl_damageeffect_bones; -bool autocvar_cl_damageeffect_distribute; -float autocvar_cl_damageeffect_lifetime; -float autocvar_cl_damageeffect_lifetime_min; -float autocvar_cl_damageeffect_lifetime_max; -int autocvar_cl_playerdetailreduction; -int autocvar_cl_modeldetailreduction; -float autocvar_cl_loddistance1 = 768; -float autocvar_cl_loddistance2 = 2048; -bool autocvar_cl_forceplayermodels; -bool autocvar_cl_forceplayercolors; -string autocvar_cl_forcemyplayermodel; -int autocvar_cl_forcemyplayerskin; -int autocvar_cl_forcemyplayercolors; -int autocvar__cl_color; -int autocvar__cl_playerskin; -string autocvar__cl_playermodel; -float autocvar_cl_deathglow; -float autocvar_cl_deathglow_min = 0.5; -bool autocvar_developer_csqcentities; -float autocvar_cl_jetpack_attenuation = 2; -bool autocvar_cl_showspectators; -int autocvar_cl_nade_timer; -bool autocvar_r_drawviewmodel; -bool autocvar_cl_race_cptimes_onlyself; -bool autocvar_cl_race_cptimes_showself = false; + + + + + + + + + + + diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc index da5c911e33..415122c96c 100644 --- a/qcsrc/client/bgmscript.qc +++ b/qcsrc/client/bgmscript.qc @@ -1,6 +1,5 @@ #include "bgmscript.qh" -#include #include #include diff --git a/qcsrc/client/bgmscript.qh b/qcsrc/client/bgmscript.qh index 18679ebb86..2ce69ca2c3 100644 --- a/qcsrc/client/bgmscript.qh +++ b/qcsrc/client/bgmscript.qh @@ -2,6 +2,8 @@ #include +float autocvar_bgmvolume; + classfield(BGMScript) .float just_toggled; float bgmtime; diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc index e143f8dbf1..15419f9669 100644 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@ -5,7 +5,6 @@ // Last updated: December 28th, 2011 // ============================================== -#include #include #include #include diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 6fea1efc04..e5f00f9460 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -1,6 +1,5 @@ #include "csqcmodel_hooks.qh" -#include #include #include #include diff --git a/qcsrc/client/csqcmodel_hooks.qh b/qcsrc/client/csqcmodel_hooks.qh index 14b171b6c2..dd10112d73 100644 --- a/qcsrc/client/csqcmodel_hooks.qh +++ b/qcsrc/client/csqcmodel_hooks.qh @@ -1,5 +1,22 @@ #pragma once +bool autocvar_cl_respawn_ghosts_keepcolors; +int autocvar_cl_playerdetailreduction; +int autocvar_cl_modeldetailreduction; +float autocvar_cl_loddistance1 = 768; +float autocvar_cl_loddistance2 = 2048; +bool autocvar_cl_forceplayermodels; +bool autocvar_cl_forceplayercolors; +string autocvar_cl_forcemyplayermodel; +int autocvar_cl_forcemyplayerskin; +int autocvar_cl_forcemyplayercolors; +int autocvar__cl_color; +int autocvar__cl_playerskin; +string autocvar__cl_playermodel; +float autocvar_cl_deathglow; +float autocvar_cl_deathglow_min = 0.5; +float autocvar_cl_jetpack_attenuation = 2; + // FEATURE: EF_NODRAW workalike const int EF_BRIGHTFIELD = BIT(0); const int EF_BRIGHTLIGHT = BIT(2); diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc index 7142b05fbc..d16e06fb65 100644 --- a/qcsrc/client/hud/crosshair.qc +++ b/qcsrc/client/hud/crosshair.qc @@ -1,6 +1,5 @@ #include "crosshair.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/crosshair.qh b/qcsrc/client/hud/crosshair.qh index 8de5e5a38b..ab725957ac 100644 --- a/qcsrc/client/hud/crosshair.qh +++ b/qcsrc/client/hud/crosshair.qh @@ -1,5 +1,63 @@ #pragma once +bool autocvar_cl_reticle = 1; +float autocvar_cl_reticle_normal_alpha = 1; +bool autocvar_cl_reticle_weapon = 1; +float autocvar_cl_reticle_weapon_alpha = 1; +bool autocvar_cl_reticle_stretch; +string autocvar_crosshair; +string autocvar_crosshair_2d = "54"; +float autocvar_crosshair_alpha; +string autocvar_crosshair_color; +int autocvar_crosshair_color_special; +float autocvar_crosshair_color_special_rainbow_brightness = 2; +float autocvar_crosshair_color_special_rainbow_delay = 0.1; +bool autocvar_crosshair_dot; +float autocvar_crosshair_dot_alpha; +string autocvar_crosshair_dot_color; +bool autocvar_crosshair_dot_color_custom = 1; +float autocvar_crosshair_dot_size; +bool autocvar_crosshair_effect_scalefade; +float autocvar_crosshair_effect_time = 0.2; +bool autocvar_crosshair_enabled = 1; +bool autocvar_crosshair_hitindication; +string autocvar_crosshair_hitindication_color; +string autocvar_crosshair_hitindication_per_weapon_color; +float autocvar_crosshair_hitindication_speed; +bool autocvar_crosshair_hittest; +bool autocvar_crosshair_hittest_blur_teammate = 0; +bool autocvar_crosshair_hittest_blur_wall = 1; +//float autocvar_crosshair_hittest_scale = 1.25; +bool autocvar_crosshair_hittest_showimpact; +bool autocvar_crosshair_per_weapon; +float autocvar_crosshair_pickup; +float autocvar_crosshair_pickup_speed; +bool autocvar_crosshair_ring; +bool autocvar_crosshair_ring_inner; +bool autocvar_crosshair_ring_minelayer; +float autocvar_crosshair_ring_minelayer_alpha; +bool autocvar_crosshair_ring_hagar; +float autocvar_crosshair_ring_hagar_alpha; +bool autocvar_crosshair_ring_vortex = 1; +float autocvar_crosshair_ring_vortex_alpha = 0.15; +float autocvar_crosshair_ring_vortex_currentcharge_movingavg_rate = 0.05; +float autocvar_crosshair_ring_vortex_currentcharge_scale = 30; +float autocvar_crosshair_ring_vortex_inner_alpha = 0.15; +float autocvar_crosshair_ring_vortex_inner_color_blue = 0; +float autocvar_crosshair_ring_vortex_inner_color_green = 0; +float autocvar_crosshair_ring_vortex_inner_color_red = 0.8; +bool autocvar_crosshair_ring_arc = 1; +vector autocvar_crosshair_ring_arc_hot_color = '1 0 0'; +float autocvar_crosshair_ring_arc_cold_alpha = 0.2; +float autocvar_crosshair_ring_arc_hot_alpha = 0.5; +float autocvar_crosshair_ring_size; +bool autocvar_crosshair_ring_reload; +float autocvar_crosshair_ring_reload_alpha; +float autocvar_crosshair_ring_reload_size; +float autocvar_crosshair_size; +bool autocvar_crosshair_chase = true; +float autocvar_crosshair_chase_playeralpha = 0.25; + float vortex_charge_movingavg; // WEAPONTODO vector crosshair_getcolor(entity this, float health_stat); diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 7cb9919b8e..9bbee3cd30 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index b8740560f9..14e1af0a0d 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -182,6 +182,26 @@ float chat_sizey; float current_player; +float autocvar__menu_alpha; // updated by the menu VM, useful to tell when the menu is being drawn + +string autocvar__hud_panelorder; + +bool autocvar_hud_cursormode = true; +string autocvar_hud_dock; +float autocvar_hud_dock_alpha; +string autocvar_hud_dock_color; +bool autocvar_hud_dock_color_team; +string autocvar_hud_panel_bg; +float autocvar_hud_panel_bg_alpha; +float autocvar_hud_panel_bg_border; +vector autocvar_hud_panel_bg_color; +float autocvar_hud_panel_bg_color_team; +float autocvar_hud_panel_bg_padding; +float autocvar_hud_panel_fg_alpha; +string autocvar_hud_skin; +float autocvar_hud_progressbar_alpha; +float autocvar_hud_panel_update_interval; + float autocvar_hud_dynamic_follow; float autocvar_hud_dynamic_follow_scale; vector autocvar_hud_dynamic_follow_scale_xyz; diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index 834107e525..36c4c9b694 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -1,8 +1,8 @@ #include "hud_config.qh" -#include #include #include +#include #include #include diff --git a/qcsrc/client/hud/hud_config.qh b/qcsrc/client/hud/hud_config.qh index f3f3d8b009..aa4c734b41 100644 --- a/qcsrc/client/hud/hud_config.qh +++ b/qcsrc/client/hud/hud_config.qh @@ -1,5 +1,11 @@ #pragma once +bool autocvar__hud_configure; +bool autocvar_hud_configure_checkcollisions; +bool autocvar_hud_configure_grid; +float autocvar_hud_configure_grid_alpha; +bool autocvar_hud_configure_teamcolorforced; + const int S_MOUSE1 = 1; const int S_MOUSE2 = 2; const int S_MOUSE3 = 4; diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index aa9a1a7a8e..ed2b6e033a 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -1,6 +1,5 @@ #include "ammo.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/ammo.qh b/qcsrc/client/hud/panel/ammo.qh index 71919d2fb0..0906a1c7e1 100644 --- a/qcsrc/client/hud/panel/ammo.qh +++ b/qcsrc/client/hud/panel/ammo.qh @@ -1,4 +1,17 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_ammo; +bool autocvar_hud_panel_ammo_dynamichud = true; +bool autocvar_hud_panel_ammo_hide_ondeath = false; +bool autocvar_hud_panel_ammo_iconalign; +int autocvar_hud_panel_ammo_maxammo; +bool autocvar_hud_panel_ammo_onlycurrent; +float autocvar_hud_panel_ammo_noncurrent_alpha = 0.7; +float autocvar_hud_panel_ammo_noncurrent_scale = 1; +bool autocvar_hud_panel_ammo_progressbar; +string autocvar_hud_panel_ammo_progressbar_name; +float autocvar_hud_panel_ammo_progressbar_xoffset; +bool autocvar_hud_panel_ammo_text; + void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector color); diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh index 8d2617955c..f9e23b726f 100644 --- a/qcsrc/client/hud/panel/centerprint.qh +++ b/qcsrc/client/hud/panel/centerprint.qh @@ -1,6 +1,23 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_centerprint; +float autocvar_hud_panel_centerprint_align; +float autocvar_hud_panel_centerprint_fade_in = 0.2; +float autocvar_hud_panel_centerprint_fade_out = 0.5; +float autocvar_hud_panel_centerprint_fade_subsequent = 1; +float autocvar_hud_panel_centerprint_fade_subsequent_passone = 3; +float autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha = 0.5; +float autocvar_hud_panel_centerprint_fade_subsequent_passtwo = 10; +float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5; +float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75; +float autocvar_hud_panel_centerprint_fade_minfontsize = 0; +bool autocvar_hud_panel_centerprint_flip; +float autocvar_hud_panel_centerprint_fontscale; +float autocvar_hud_panel_centerprint_fontscale_bold = 1.4; +bool autocvar_hud_panel_centerprint_dynamichud = true; +float autocvar_hud_panel_centerprint_time; + void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num); void centerprint_AddStandard(string strMessage); void centerprint_Kill(int id); diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc index 13ef78136d..954a3676af 100644 --- a/qcsrc/client/hud/panel/chat.qc +++ b/qcsrc/client/hud/panel/chat.qc @@ -1,6 +1,5 @@ #include "chat.qh" -#include #include // Chat (#12) diff --git a/qcsrc/client/hud/panel/chat.qh b/qcsrc/client/hud/panel/chat.qh index 6db88c68b3..31bbaf71c1 100644 --- a/qcsrc/client/hud/panel/chat.qh +++ b/qcsrc/client/hud/panel/chat.qh @@ -1,2 +1,11 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_chat; + +bool autocvar__con_chat_maximized; +bool autocvar_con_chat; +bool autocvar_con_chatrect; +float autocvar_con_chatsize; +float autocvar_con_notify; +float autocvar_con_notifysize; diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc index 41fdb3a5bb..4b4911e33c 100644 --- a/qcsrc/client/hud/panel/engineinfo.qc +++ b/qcsrc/client/hud/panel/engineinfo.qc @@ -1,6 +1,5 @@ #include "engineinfo.qh" -#include #include // Engine info (#13) diff --git a/qcsrc/client/hud/panel/engineinfo.qh b/qcsrc/client/hud/panel/engineinfo.qh index 6db88c68b3..3ad6a77eab 100644 --- a/qcsrc/client/hud/panel/engineinfo.qh +++ b/qcsrc/client/hud/panel/engineinfo.qh @@ -1,2 +1,7 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_engineinfo; +bool autocvar_hud_panel_engineinfo_dynamichud = true; +float autocvar_hud_panel_engineinfo_framecounter_decimals; +float autocvar_hud_panel_engineinfo_framecounter_time; diff --git a/qcsrc/client/hud/panel/healtharmor.qh b/qcsrc/client/hud/panel/healtharmor.qh index 6db88c68b3..7bd7b88934 100644 --- a/qcsrc/client/hud/panel/healtharmor.qh +++ b/qcsrc/client/hud/panel/healtharmor.qh @@ -1,2 +1,25 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_healtharmor; +int autocvar_hud_panel_healtharmor_baralign; +bool autocvar_hud_panel_healtharmor_combined; +bool autocvar_hud_panel_healtharmor_dynamichud = true; +bool autocvar_hud_panel_healtharmor_flip; +bool autocvar_hud_panel_healtharmor_hide_ondeath = false; +int autocvar_hud_panel_healtharmor_iconalign; +int autocvar_hud_panel_healtharmor_maxarmor; +int autocvar_hud_panel_healtharmor_maxhealth; +bool autocvar_hud_panel_healtharmor_progressbar; +string autocvar_hud_panel_healtharmor_progressbar_armor; +string autocvar_hud_panel_healtharmor_progressbar_health; +bool autocvar_hud_panel_healtharmor_progressbar_gfx; +float autocvar_hud_panel_healtharmor_progressbar_gfx_damage; +float autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth; +float autocvar_hud_panel_healtharmor_progressbar_gfx_smooth; +int autocvar_hud_panel_healtharmor_text; + +vector autocvar_hud_progressbar_armor_color; +vector autocvar_hud_progressbar_fuel_color; +vector autocvar_hud_progressbar_health_color; +vector autocvar_hud_progressbar_oxygen_color = '0.1 1 1'; diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc index 7ebc35fcb6..5169ea5f38 100644 --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@ -1,6 +1,5 @@ #include "infomessages.qh" -#include #include #include diff --git a/qcsrc/client/hud/panel/infomessages.qh b/qcsrc/client/hud/panel/infomessages.qh index 6db88c68b3..197662640d 100644 --- a/qcsrc/client/hud/panel/infomessages.qh +++ b/qcsrc/client/hud/panel/infomessages.qh @@ -1,2 +1,8 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_infomessages; +bool autocvar_hud_panel_infomessages_dynamichud = false; +bool autocvar_hud_panel_infomessages_flip; + +bool autocvar_cl_showspectators; diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index e488e31ac3..fdaf50de22 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -1,6 +1,5 @@ #include "modicons.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/modicons.qh b/qcsrc/client/hud/panel/modicons.qh index c90c0991f5..09fd287698 100644 --- a/qcsrc/client/hud/panel/modicons.qh +++ b/qcsrc/client/hud/panel/modicons.qh @@ -1,4 +1,7 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_modicons; +bool autocvar_hud_panel_modicons_dynamichud = true; + bool mod_active; // is there any active mod icon? diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc index b3804eccf3..c2692da081 100644 --- a/qcsrc/client/hud/panel/notify.qc +++ b/qcsrc/client/hud/panel/notify.qc @@ -1,6 +1,5 @@ #include "notify.qh" -#include #include // Notifications (#4) diff --git a/qcsrc/client/hud/panel/notify.qh b/qcsrc/client/hud/panel/notify.qh index 6db88c68b3..4207af836b 100644 --- a/qcsrc/client/hud/panel/notify.qh +++ b/qcsrc/client/hud/panel/notify.qh @@ -1,2 +1,11 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_notify; +bool autocvar_hud_panel_notify_dynamichud = true; +float autocvar_hud_panel_notify_fadetime; +float autocvar_hud_panel_notify_flip; +float autocvar_hud_panel_notify_fontsize; +float autocvar_hud_panel_notify_time; +float autocvar_hud_panel_notify_icon_aspect; + diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc index da20526222..977dc797e2 100644 --- a/qcsrc/client/hud/panel/physics.qc +++ b/qcsrc/client/hud/panel/physics.qc @@ -1,6 +1,5 @@ #include "physics.qh" -#include #include #include diff --git a/qcsrc/client/hud/panel/physics.qh b/qcsrc/client/hud/panel/physics.qh index 6db88c68b3..e0f93b0f53 100644 --- a/qcsrc/client/hud/panel/physics.qh +++ b/qcsrc/client/hud/panel/physics.qh @@ -1,2 +1,27 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_physics; +float autocvar_hud_panel_physics_acceleration_movingaverage = 1; +float autocvar_hud_panel_physics_acceleration_progressbar_mode; +float autocvar_hud_panel_physics_acceleration_progressbar_scale; +float autocvar_hud_panel_physics_acceleration_progressbar_nonlinear; +float autocvar_hud_panel_physics_acceleration_max; +float autocvar_hud_panel_physics_update_interval; +int autocvar_hud_panel_physics_progressbar; +bool autocvar_hud_panel_physics_acceleration_vertical; +int autocvar_hud_panel_physics_baralign; +bool autocvar_hud_panel_physics_flip; +bool autocvar_hud_panel_physics_dynamichud = true; +float autocvar_hud_panel_physics_speed_max; +int autocvar_hud_panel_physics_speed_unit; +bool autocvar_hud_panel_physics_speed_unit_show; +bool autocvar_hud_panel_physics_speed_vertical; +int autocvar_hud_panel_physics_text; +float autocvar_hud_panel_physics_text_scale; +bool autocvar_hud_panel_physics_topspeed; +float autocvar_hud_panel_physics_topspeed_time; + +vector autocvar_hud_progressbar_acceleration_color; +vector autocvar_hud_progressbar_acceleration_neg_color; +vector autocvar_hud_progressbar_speed_color; diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc index b97c80f0b3..9a4ab1df3f 100644 --- a/qcsrc/client/hud/panel/powerups.qc +++ b/qcsrc/client/hud/panel/powerups.qc @@ -1,6 +1,5 @@ #include "powerups.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/powerups.qh b/qcsrc/client/hud/panel/powerups.qh index 3235f8da67..a109062a48 100644 --- a/qcsrc/client/hud/panel/powerups.qh +++ b/qcsrc/client/hud/panel/powerups.qh @@ -1,4 +1,16 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_powerups; +int autocvar_hud_panel_powerups_baralign; +bool autocvar_hud_panel_powerups_dynamichud = true; +bool autocvar_hud_panel_powerups_hide_ondeath = false; +int autocvar_hud_panel_powerups_iconalign; +bool autocvar_hud_panel_powerups_progressbar; +bool autocvar_hud_panel_powerups_text; + +vector autocvar_hud_progressbar_shield_color; +vector autocvar_hud_progressbar_strength_color; +vector autocvar_hud_progressbar_superweapons_color; + void addPowerupItem(string name, string icon, vector color, float currentTime, float lifeTime); diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc index c26e420941..7940e9462e 100644 --- a/qcsrc/client/hud/panel/pressedkeys.qc +++ b/qcsrc/client/hud/panel/pressedkeys.qc @@ -1,6 +1,5 @@ #include "pressedkeys.qh" -#include #include // Pressed keys (#11) diff --git a/qcsrc/client/hud/panel/pressedkeys.qh b/qcsrc/client/hud/panel/pressedkeys.qh index 6db88c68b3..1cc663f609 100644 --- a/qcsrc/client/hud/panel/pressedkeys.qh +++ b/qcsrc/client/hud/panel/pressedkeys.qh @@ -1,2 +1,7 @@ #pragma once #include "../panel.qh" + +int autocvar_hud_panel_pressedkeys; +float autocvar_hud_panel_pressedkeys_aspect; +bool autocvar_hud_panel_pressedkeys_attack; +bool autocvar_hud_panel_pressedkeys_dynamichud = true; diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index a0cc09a014..dfe4db90f9 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -1,6 +1,5 @@ #include "quickmenu.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/quickmenu.qh b/qcsrc/client/hud/panel/quickmenu.qh index 694f0d1d7e..3b6a1fe721 100644 --- a/qcsrc/client/hud/panel/quickmenu.qh +++ b/qcsrc/client/hud/panel/quickmenu.qh @@ -1,6 +1,12 @@ #pragma once #include "../panel.qh" +//float autocvar_hud_panel_quickmenu; +float autocvar_hud_panel_quickmenu_align; +float autocvar_hud_panel_quickmenu_translatecommands; +string autocvar_hud_panel_quickmenu_file; +float autocvar_hud_panel_quickmenu_time; + bool QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondary); bool QuickMenu_IsOpened(); void QuickMenu_Mouse(); diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc index b4629bb81c..7ecdf1a821 100644 --- a/qcsrc/client/hud/panel/racetimer.qc +++ b/qcsrc/client/hud/panel/racetimer.qc @@ -1,6 +1,5 @@ #include "racetimer.qh" -#include #include // Race timer (#8) diff --git a/qcsrc/client/hud/panel/racetimer.qh b/qcsrc/client/hud/panel/racetimer.qh index 27cf20e875..ba7bd32298 100644 --- a/qcsrc/client/hud/panel/racetimer.qh +++ b/qcsrc/client/hud/panel/racetimer.qh @@ -1,6 +1,9 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_racetimer; +bool autocvar_hud_panel_racetimer_dynamichud = true; + // QUALIFYING float race_checkpoint; float race_time; diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index 1aa07f4d10..b87ab97762 100644 --- a/qcsrc/client/hud/panel/radar.qc +++ b/qcsrc/client/hud/panel/radar.qc @@ -1,6 +1,5 @@ #include "radar.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/radar.qh b/qcsrc/client/hud/panel/radar.qh index d2fbc8f6b2..0497d651fa 100644 --- a/qcsrc/client/hud/panel/radar.qh +++ b/qcsrc/client/hud/panel/radar.qh @@ -1,4 +1,15 @@ #pragma once #include "../panel.qh" +int autocvar_hud_panel_radar; +bool autocvar_hud_panel_radar_dynamichud = true; +float autocvar_hud_panel_radar_foreground_alpha; +float autocvar_hud_panel_radar_maximized_scale; +vector autocvar_hud_panel_radar_maximized_size; +float autocvar_hud_panel_radar_rotation; +float autocvar_hud_panel_radar_scale; +int autocvar_hud_panel_radar_zoommode; +float autocvar_hud_panel_radar_maximized_rotation; +int autocvar_hud_panel_radar_maximized_zoommode; + void HUD_Radar_Show_Maximized(bool doshow, bool clickable); diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc index bf77d739fc..24a059a6c9 100644 --- a/qcsrc/client/hud/panel/score.qc +++ b/qcsrc/client/hud/panel/score.qc @@ -1,6 +1,5 @@ #include "score.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/score.qh b/qcsrc/client/hud/panel/score.qh index 6db88c68b3..fa432ba190 100644 --- a/qcsrc/client/hud/panel/score.qh +++ b/qcsrc/client/hud/panel/score.qh @@ -1,2 +1,6 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_score; +bool autocvar_hud_panel_score_dynamichud = true; +bool autocvar_hud_panel_score_rankings; diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 7db383a394..5821dc4694 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -1,7 +1,7 @@ #include "scoreboard.qh" -#include #include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/scoreboard.qh b/qcsrc/client/hud/panel/scoreboard.qh index ded11c2606..f0dbdb5c6d 100644 --- a/qcsrc/client/hud/panel/scoreboard.qh +++ b/qcsrc/client/hud/panel/scoreboard.qh @@ -1,6 +1,9 @@ #pragma once #include "../panel.qh" +bool autocvar_cl_deathscoreboard; +string autocvar_scoreboard_columns; + bool scoreboard_showscores; bool scoreboard_active; diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc index bc33063861..dd9594b7b5 100644 --- a/qcsrc/client/hud/panel/strafehud.qc +++ b/qcsrc/client/hud/panel/strafehud.qc @@ -2,10 +2,10 @@ #include "strafehud.qh" -#include #include #include #include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh index acc43bde90..2fbd9b2752 100644 --- a/qcsrc/client/hud/panel/strafehud.qh +++ b/qcsrc/client/hud/panel/strafehud.qh @@ -1,6 +1,55 @@ #pragma once #include "../panel.qh" +int autocvar_hud_panel_strafehud = 3; +bool autocvar__hud_panel_strafehud_demo = false; +bool autocvar_hud_panel_strafehud_dynamichud = true; +int autocvar_hud_panel_strafehud_mode = 0; +float autocvar_hud_panel_strafehud_range = 0; +int autocvar_hud_panel_strafehud_style = 1; +int autocvar_hud_panel_strafehud_unit = 1; +bool autocvar_hud_panel_strafehud_unit_show = true; +vector autocvar_hud_panel_strafehud_bar_neutral_color = '1 1 1'; +float autocvar_hud_panel_strafehud_bar_neutral_alpha = 0.3; +vector autocvar_hud_panel_strafehud_bar_accel_color = '0 1 0'; +float autocvar_hud_panel_strafehud_bar_accel_alpha = 0.3; +vector autocvar_hud_panel_strafehud_bar_overturn_color = '1 0 1'; +float autocvar_hud_panel_strafehud_bar_overturn_alpha = 0.3; +float autocvar_hud_panel_strafehud_angle_alpha = 0.8; +float autocvar_hud_panel_strafehud_angle_height = 1.5; +float autocvar_hud_panel_strafehud_angle_width = 0.005; +vector autocvar_hud_panel_strafehud_angle_neutral_color = '1 1 0'; +vector autocvar_hud_panel_strafehud_angle_accel_color = '0 1 1'; +vector autocvar_hud_panel_strafehud_angle_overturn_color = '1 0 1'; +float autocvar_hud_panel_strafehud_switch_minspeed = -1; +vector autocvar_hud_panel_strafehud_switch_active_color = '0 1 0'; +float autocvar_hud_panel_strafehud_switch_active_alpha = 1; +vector autocvar_hud_panel_strafehud_switch_inactive_color = '1 1 0'; +float autocvar_hud_panel_strafehud_switch_inactive_alpha = 1; +float autocvar_hud_panel_strafehud_switch_width = 0.0075; +vector autocvar_hud_panel_strafehud_direction_color = '0 0.5 1'; +float autocvar_hud_panel_strafehud_direction_alpha = 1; +float autocvar_hud_panel_strafehud_direction_width = 0.25; +float autocvar_hud_panel_strafehud_direction_length = 0.02; +float autocvar_hud_panel_strafehud_slickdetector_range = 0; +int autocvar_hud_panel_strafehud_slickdetector_granularity = 2; +vector autocvar_hud_panel_strafehud_slickdetector_color = '0 1 1'; +float autocvar_hud_panel_strafehud_slickdetector_alpha = 0.5; +float autocvar_hud_panel_strafehud_slickdetector_height = 0.125; +float autocvar_hud_panel_strafehud_startspeed_fade = 0; +vector autocvar_hud_panel_strafehud_startspeed_color = '1 0.75 0'; +float autocvar_hud_panel_strafehud_startspeed_size = 1.5; +float autocvar_hud_panel_strafehud_jumpheight_fade = 0; +float autocvar_hud_panel_strafehud_jumpheight_min = 50; +vector autocvar_hud_panel_strafehud_jumpheight_color = '0 1 0.75'; +float autocvar_hud_panel_strafehud_jumpheight_size = 1.5; +float autocvar_hud_panel_strafehud_timeout_air = 0.1; +float autocvar_hud_panel_strafehud_timeout_ground = 0.03333333; +float autocvar_hud_panel_strafehud_timeout_turn = 0.1; +float autocvar_hud_panel_strafehud_timeout_direction = 0.5; +float autocvar_hud_panel_strafehud_antiflicker_angle = 0.01; +float autocvar_hud_panel_strafehud_antiflicker_speed = 0.0001; + void HUD_Panel_DrawStrafeHUD(float, float, vector, float, int, int); vector StrafeHUD_mixColors(vector, vector, float); void StrafeHUD_drawGradient(vector, vector, vector, float, float, float, float, int); diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index 446c6229bd..0cdfefa789 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -1,6 +1,5 @@ #include "timer.qh" -#include #include #include diff --git a/qcsrc/client/hud/panel/timer.qh b/qcsrc/client/hud/panel/timer.qh index 6db88c68b3..309f04249c 100644 --- a/qcsrc/client/hud/panel/timer.qh +++ b/qcsrc/client/hud/panel/timer.qh @@ -1,2 +1,6 @@ #pragma once #include "../panel.qh" + +bool autocvar_hud_panel_timer; +bool autocvar_hud_panel_timer_dynamichud = true; +bool autocvar_hud_panel_timer_increment; diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc index 978851e491..5563699084 100644 --- a/qcsrc/client/hud/panel/vote.qc +++ b/qcsrc/client/hud/panel/vote.qc @@ -1,6 +1,5 @@ #include "vote.qh" -#include #include // Vote (#9) diff --git a/qcsrc/client/hud/panel/vote.qh b/qcsrc/client/hud/panel/vote.qh index 3a6f45f80d..028ca65b63 100644 --- a/qcsrc/client/hud/panel/vote.qh +++ b/qcsrc/client/hud/panel/vote.qh @@ -1,4 +1,10 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_vote; +float autocvar_hud_panel_vote_alreadyvoted_alpha; +bool autocvar_hud_panel_vote_dynamichud = true; + +int autocvar_cl_allow_uid2name; + float uid2name_dialog; diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc index 003d883915..7ac8b8dae6 100644 --- a/qcsrc/client/hud/panel/weapons.qc +++ b/qcsrc/client/hud/panel/weapons.qc @@ -1,6 +1,5 @@ #include "weapons.qh" -#include #include #include #include diff --git a/qcsrc/client/hud/panel/weapons.qh b/qcsrc/client/hud/panel/weapons.qh index 1315b0f021..afb2ee16bc 100644 --- a/qcsrc/client/hud/panel/weapons.qh +++ b/qcsrc/client/hud/panel/weapons.qh @@ -1,6 +1,45 @@ #pragma once #include "../panel.qh" +bool autocvar_hud_panel_weapons; +bool autocvar_hud_panel_weapons_accuracy; +bool autocvar_hud_panel_weapons_ammo; +float autocvar_hud_panel_weapons_ammo_alpha; +string autocvar_hud_panel_weapons_ammo_color; +int autocvar_hud_panel_weapons_ammo_full_cells; +int autocvar_hud_panel_weapons_ammo_full_plasma; +int autocvar_hud_panel_weapons_ammo_full_fuel; +int autocvar_hud_panel_weapons_ammo_full_nails; +int autocvar_hud_panel_weapons_ammo_full_rockets; +int autocvar_hud_panel_weapons_ammo_full_shells; +float autocvar_hud_panel_weapons_aspect; +bool autocvar_hud_panel_weapons_complainbubble; +string autocvar_hud_panel_weapons_complainbubble_color_donthave; +string autocvar_hud_panel_weapons_complainbubble_color_outofammo; +string autocvar_hud_panel_weapons_complainbubble_color_unavailable; +float autocvar_hud_panel_weapons_complainbubble_fadetime; +float autocvar_hud_panel_weapons_complainbubble_padding; +float autocvar_hud_panel_weapons_complainbubble_time; +bool autocvar_hud_panel_weapons_dynamichud = true; +bool autocvar_hud_panel_weapons_hide_ondeath = false; +int autocvar_hud_panel_weapons_label; +float autocvar_hud_panel_weapons_label_scale = 0.5; +int autocvar_hud_panel_weapons_onlyowned; +float autocvar_hud_panel_weapons_noncurrent_alpha = 1; +float autocvar_hud_panel_weapons_noncurrent_scale = 1; +float autocvar_hud_panel_weapons_selection_radius = 0; +float autocvar_hud_panel_weapons_selection_speed = 10; +float autocvar_hud_panel_weapons_timeout; +int autocvar_hud_panel_weapons_timeout_effect; +bool autocvar_hud_panel_weapons_orderbyimpulse = true; +float autocvar_hud_panel_weapons_timeout_fadebgmin; +float autocvar_hud_panel_weapons_timeout_fadefgmin; +float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; +float autocvar_hud_panel_weapons_timeout_speed_out = 0.75; + +string autocvar_accuracy_color_levels; +string autocvar_cl_weaponpriority; + const int MAX_ACCURACY_LEVELS = 10; float acc_lev[MAX_ACCURACY_LEVELS]; vector acc_col[MAX_ACCURACY_LEVELS]; diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index 1653ef6435..83417c08d9 100644 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@ -3,6 +3,23 @@ #include #include +bool autocvar_cl_db_saveasdump; +bool autocvar_cl_spawn_event_particles; +bool autocvar_cl_spawn_event_sound = 1; +// float autocvar_cl_spawn_point_model; +bool autocvar_cl_spawn_point_particles; +float autocvar_cl_spawn_point_dist_max = 1200; +bool autocvar_cl_unpress_zoom_on_spawn = true; +bool autocvar_cl_unpress_zoom_on_death = true; +bool autocvar_cl_unpress_zoom_on_weapon_switch = true; +bool autocvar_cl_unpress_attack_on_weapon_switch = false; +bool autocvar_hud_showbinds; +bool autocvar_hud_showbinds_limit; +bool autocvar__hud_showbinds_reload; +bool autocvar_developer_csqcentities; +bool autocvar_cl_race_cptimes_onlyself; // TODO: move to race gamemode +bool autocvar_cl_race_cptimes_showself = false; + // Map coordinate base calculations need these vector mi_center; vector mi_scale; diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index f8ae14bffb..5be42cda96 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,6 +1,5 @@ #include "mapvoting.qh" -#include #include #include #include diff --git a/qcsrc/client/mapvoting.qh b/qcsrc/client/mapvoting.qh index 8d184a95d7..390b91304c 100644 --- a/qcsrc/client/mapvoting.qh +++ b/qcsrc/client/mapvoting.qh @@ -1,6 +1,11 @@ #pragma once #include + +bool autocvar_cl_readpicture_force; +float autocvar_hud_panel_mapvote_highlight_border = 1; +string autocvar_menu_skin; // gamemode icons are controlled by the menu skin + void MapVote_Draw(); bool PreviewExists(string name); diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 20c5fe55f8..e81dd5b879 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -1,6 +1,5 @@ #include "shownames.qh" -#include #include #include #include diff --git a/qcsrc/client/shownames.qh b/qcsrc/client/shownames.qh index a05ca701d0..b5bf6bacc4 100644 --- a/qcsrc/client/shownames.qh +++ b/qcsrc/client/shownames.qh @@ -1,5 +1,25 @@ #pragma once +bool autocvar_hud_shownames; +bool autocvar_hud_shownames_enemies; +float autocvar_hud_shownames_crosshairdistance; +float autocvar_hud_shownames_crosshairdistance_time; +float autocvar_hud_shownames_crosshairdistance_antioverlap; +bool autocvar_hud_shownames_self; +bool autocvar_hud_shownames_status; +float autocvar_hud_shownames_statusbar_height; +float autocvar_hud_shownames_statusbar_highlight = 1; +float autocvar_hud_shownames_aspect; +float autocvar_hud_shownames_fontsize; +int autocvar_hud_shownames_decolorize; +float autocvar_hud_shownames_alpha; +bool autocvar_hud_shownames_resize; +float autocvar_hud_shownames_mindistance; +float autocvar_hud_shownames_maxdistance; +bool autocvar_hud_shownames_antioverlap; +float autocvar_hud_shownames_antioverlap_distance; +float autocvar_hud_shownames_offset; + entityclass(ShowNames); classfield(ShowNames) .float healthvalue; classfield(ShowNames) .float armorvalue; diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 9e79f0a226..12f7852202 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,7 +1,7 @@ #include "teamradar.qh" -#include #include +#include #include #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index d4eec15d59..e03dca633c 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,7 +1,6 @@ #include "view.qh" #include -#include #include #include #include diff --git a/qcsrc/client/view.qh b/qcsrc/client/view.qh index ae6487796a..cc3424edd6 100644 --- a/qcsrc/client/view.qh +++ b/qcsrc/client/view.qh @@ -2,6 +2,96 @@ #include +bool autocvar_camera_chase_smoothly; +bool autocvar_camera_enable; +bool autocvar_camera_forward_follows; +bool autocvar_camera_free; +float autocvar_camera_look_attenuation; +float autocvar_camera_look_player; +float autocvar_camera_mouse_threshold; +bool autocvar_camera_reset; +float autocvar_camera_speed_attenuation; +float autocvar_camera_speed_chase; +float autocvar_camera_speed_free; +float autocvar_camera_speed_roll; +int autocvar_chase_active; +int autocvar_cl_gentle_damage; +bool autocvar_cl_lockview; +bool autocvar_cl_orthoview; +bool autocvar_cl_orthoview_nofog; +bool autocvar_cl_spawnzoom = 1; +float autocvar_cl_spawnzoom_speed = 1; +float autocvar_cl_spawnzoom_factor = 2; +bool autocvar_cl_stripcolorcodes; +bool autocvar_cl_velocityzoom_enabled; +float autocvar_cl_velocityzoom_factor; +int autocvar_cl_velocityzoom_type = 3; +float autocvar_cl_velocityzoom_speed; +float autocvar_cl_velocityzoom_time; +float autocvar_cl_zoomfactor; +float autocvar_cl_zoomsensitivity; +float autocvar_cl_zoomspeed; +float autocvar_fov; +float autocvar_hud_colorflash_alpha; +bool autocvar_hud_contents; +float autocvar_hud_contents_blur; +float autocvar_hud_contents_blur_alpha; +float autocvar_hud_contents_fadeintime; +float autocvar_hud_contents_fadeouttime; +float autocvar_hud_contents_lava_alpha; +string autocvar_hud_contents_lava_color; +float autocvar_hud_contents_slime_alpha; +string autocvar_hud_contents_slime_color; +float autocvar_hud_contents_water_alpha; +string autocvar_hud_contents_water_color; +bool autocvar_hud_damage; +float autocvar_hud_damage_blur; +float autocvar_hud_damage_blur_alpha; +string autocvar_hud_damage_color; +float autocvar_hud_damage_factor; +float autocvar_hud_damage_fade_rate; +float autocvar_hud_damage_gentle_alpha_multiplier; +string autocvar_hud_damage_gentle_color; +float autocvar_hud_damage_maxalpha; +float autocvar_hud_damage_pain_threshold; +float autocvar_hud_damage_pain_threshold_lower; +float autocvar_hud_damage_pain_threshold_lower_health; +float autocvar_hud_damage_pain_threshold_pulsating_min; +float autocvar_hud_damage_pain_threshold_pulsating_period; +bool autocvar_hud_powerup; +bool autocvar_hud_postprocessing; +float autocvar_hud_postprocessing_maxbluralpha; +float autocvar_hud_postprocessing_maxblurradius; +float autocvar_menu_mouse_speed; +int autocvar_r_fakelight; +bool autocvar_r_fullbright; +float autocvar_r_letterbox; +bool autocvar_v_flipped; +int autocvar_vid_conheight; +int autocvar_vid_conwidth; +float autocvar_vid_pixelheight; +float autocvar_viewsize; +bool autocvar_cl_eventchase_vehicle = 1; +vector autocvar_cl_eventchase_vehicle_viewoffset = '0 0 80'; +float autocvar_cl_eventchase_vehicle_distance = 250; +int autocvar_cl_hitsound; +float autocvar_cl_hitsound_min_pitch = 0.75; +float autocvar_cl_hitsound_max_pitch = 1.5; +float autocvar_cl_hitsound_nom_damage = 25; +float autocvar_cl_hitsound_antispam_time; +bool autocvar_cl_eventchase_spectated_change = false; +float autocvar_cl_eventchase_spectated_change_time = 1; +int autocvar_cl_eventchase_death = 2; +float autocvar_cl_eventchase_distance = 140; +bool autocvar_cl_eventchase_frozen = false; +float autocvar_cl_eventchase_speed = 1.3; +vector autocvar_cl_eventchase_maxs = '12 12 8'; +vector autocvar_cl_eventchase_mins = '-12 -12 -8'; +vector autocvar_cl_eventchase_viewoffset = '0 0 20'; +string autocvar__togglezoom; +int autocvar_cl_nade_timer; +bool autocvar_r_drawviewmodel; + void calc_followmodel_ofs(entity view); vector project_3d_to_2d(vector vec); diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 6e4903f4d9..3fe6deb78f 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -1,6 +1,5 @@ #include "projectile.qh" -#include #include #include #include diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh index 0686c05825..b3cfd3e9b1 100644 --- a/qcsrc/client/weapons/projectile.qh +++ b/qcsrc/client/weapons/projectile.qh @@ -2,6 +2,8 @@ #include +bool autocvar_cl_projectiles_sloppy; + entityclass(Projectile); classfield(Projectile).int traileffect; diff --git a/qcsrc/common/effects/qc/casings.qh b/qcsrc/common/effects/qc/casings.qh index 137aa365ca..2dac5f652f 100644 --- a/qcsrc/common/effects/qc/casings.qh +++ b/qcsrc/common/effects/qc/casings.qh @@ -1,5 +1,13 @@ #pragma once +#ifdef CSQC +float autocvar_cl_casings_bronze_time; +int autocvar_cl_casings_maxcount = 100; +float autocvar_cl_casings_shell_time; +bool autocvar_cl_casings_sloppy = 1; +float autocvar_cl_casings_ticrate = 0.1; +#endif + #ifdef SVQC void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity); #endif diff --git a/qcsrc/common/effects/qc/damageeffects.qh b/qcsrc/common/effects/qc/damageeffects.qh index 3629639c21..1e02e70aae 100644 --- a/qcsrc/common/effects/qc/damageeffects.qh +++ b/qcsrc/common/effects/qc/damageeffects.qh @@ -7,6 +7,14 @@ #include #include +int autocvar_cl_damageeffect; +float autocvar_cl_damageeffect_ticrate; +float autocvar_cl_damageeffect_bones; +bool autocvar_cl_damageeffect_distribute; +float autocvar_cl_damageeffect_lifetime; +float autocvar_cl_damageeffect_lifetime_min; +float autocvar_cl_damageeffect_lifetime_max; + int w_deathtype; float w_issilent, w_random; vector w_org, w_backoff; diff --git a/qcsrc/common/effects/qc/gibs.qh b/qcsrc/common/effects/qc/gibs.qh index 40e0834552..5a7c3ae692 100644 --- a/qcsrc/common/effects/qc/gibs.qh +++ b/qcsrc/common/effects/qc/gibs.qh @@ -1,5 +1,25 @@ #pragma once +#ifdef GAMEQC +int autocvar_ekg; +#endif + +#ifdef CSQC +int autocvar_cl_gentle_gibs; +float autocvar_cl_gibs_damageforcescale = 3.5; +float autocvar_cl_gibs_lifetime = 14; +int autocvar_cl_gibs_maxcount = 100; +bool autocvar_cl_gibs_sloppy = 1; +float autocvar_cl_gibs_ticrate = 0.1; +float autocvar_cl_gibs_velocity_random = 1; +float autocvar_cl_gibs_velocity_scale = 1; +float autocvar_cl_gibs_avelocity_scale = 1; +float autocvar_cl_gibs_velocity_up; +bool autocvar_cl_nogibs; +bool autocvar_cl_particlegibs; +float autocvar_cl_particles_quality; +#endif + #ifdef SVQC void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker); void Violence_GibSplash(entity source, float type, float amount, entity attacker); diff --git a/qcsrc/common/effects/qc/lightningarc.qh b/qcsrc/common/effects/qc/lightningarc.qh index 219097540f..64bc14271d 100644 --- a/qcsrc/common/effects/qc/lightningarc.qh +++ b/qcsrc/common/effects/qc/lightningarc.qh @@ -1,5 +1,14 @@ #pragma once +#ifdef CSQC +float autocvar_cl_effects_lightningarc_branchfactor_add; +float autocvar_cl_effects_lightningarc_branchfactor_start; +float autocvar_cl_effects_lightningarc_drift_end; +float autocvar_cl_effects_lightningarc_drift_start; +float autocvar_cl_effects_lightningarc_segmentlength; +bool autocvar_cl_effects_lightningarc_simple; +#endif + #ifdef SVQC void te_csqc_lightningarc(vector from, vector to); #endif diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh index 7ccd5bbb2f..586d7eb17e 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh +++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh @@ -1,5 +1,7 @@ #pragma once +int autocvar_hud_panel_modicons_ca_layout; + void HUD_Mod_CA(vector myPos, vector mySize); void HUD_Mod_CA_Draw(vector myPos, vector mySize, int layout); void HUD_Mod_CA_Export(int fh); diff --git a/qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc index 80a9f19710..dc49c605c5 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc @@ -2,6 +2,7 @@ #include #include +#include #include // CTF HUD modicon section diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh index 0d2f4407be..75bfeefd48 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh +++ b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh @@ -1,3 +1,5 @@ #pragma once +int autocvar_hud_panel_modicons_freezetag_layout; + void HUD_Mod_FreezeTag_Export(int fh); diff --git a/qcsrc/common/gamemodes/gamemode/nexball/cl_nexball.qh b/qcsrc/common/gamemodes/gamemode/nexball/cl_nexball.qh index b92c272063..eba7cccd97 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/cl_nexball.qh +++ b/qcsrc/common/gamemodes/gamemode/nexball/cl_nexball.qh @@ -1,5 +1,7 @@ #pragma once +vector autocvar_hud_progressbar_nexball_color; + void HUD_Mod_NexBall(vector pos, vector mySize); float nb_pb_period; diff --git a/qcsrc/common/gamemodes/gamemode/race/cl_race.qh b/qcsrc/common/gamemodes/gamemode/race/cl_race.qh index 8ed2e3a671..43d16b0a51 100644 --- a/qcsrc/common/gamemodes/gamemode/race/cl_race.qh +++ b/qcsrc/common/gamemodes/gamemode/race/cl_race.qh @@ -1,3 +1,6 @@ #pragma once +bool autocvar_cl_autodemo_delete; +bool autocvar_cl_autodemo_delete_keeprecords; + void HUD_Mod_Race(vector pos, vector mySize); diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc index 74c867c3ac..5cc1defd16 100644 --- a/qcsrc/common/minigames/cl_minigames_hud.qc +++ b/qcsrc/common/minigames/cl_minigames_hud.qc @@ -1,7 +1,7 @@ #include "cl_minigames_hud.qh" -#include #include +#include #include #include #include diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc index e99a6af5dc..19045727b6 100644 --- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc +++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc @@ -39,6 +39,7 @@ STATIC_INIT(ItemsTime_Init) { int autocvar_hud_panel_itemstime = 2; float autocvar_hud_panel_itemstime_dynamicsize = 1; float autocvar_hud_panel_itemstime_ratio = 2; +//bool autocvar_hud_panel_itemstime_dynamichud = true; int autocvar_hud_panel_itemstime_iconalign; bool autocvar_hud_panel_itemstime_progressbar = 0; float autocvar_hud_panel_itemstime_progressbar_maxtime = 30; diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh index f08e2eceee..2274da336e 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh @@ -27,6 +27,8 @@ classfield(WaypointSprite) .float build_started; classfield(WaypointSprite) .float build_starthealth; classfield(WaypointSprite) .float build_finished; +bool autocvar_cl_hidewaypoints; + float autocvar_g_waypointsprite_alpha; float autocvar_g_waypointsprite_crosshairfadealpha; float autocvar_g_waypointsprite_crosshairfadedistance; diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 481154f3e6..a94ac9ab93 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -8,10 +8,6 @@ #include #include -#ifdef CSQC -#include -#endif - // Operator for bold notifications #define BOLD_OPERATOR "^BOLD" diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 0663c49cfa..ac866bacc4 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -197,6 +197,8 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t #ifdef GAMEQC #ifdef CSQC + bool autocvar_cl_gentle; + int autocvar_cl_gentle_messages; #define GENTLE (autocvar_cl_gentle || autocvar_cl_gentle_messages) #else #define GENTLE autocvar_sv_gentle diff --git a/qcsrc/common/vehicles/cl_vehicles.qh b/qcsrc/common/vehicles/cl_vehicles.qh index 327074b986..f455e86c68 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qh +++ b/qcsrc/common/vehicles/cl_vehicles.qh @@ -1,5 +1,15 @@ #pragma once +bool autocvar_cl_vehicles_alarm = false; +bool autocvar_cl_vehicles_hud_tactical = true; +float autocvar_cl_vehicles_hudscale = 0.5; +float autocvar_cl_vehicles_notify_time = 15; +float autocvar_cl_vehicles_crosshair_size = 0.5; +bool autocvar_cl_vehicles_crosshair_colorize = true; +bool autocvar__vehicles_shownchasemessage; +vector autocvar_hud_progressbar_vehicles_ammo1_color; +vector autocvar_hud_progressbar_vehicles_ammo2_color; + vector vehicleHud_Size; vector vehicleHud_Pos; diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index b0e3b58a0e..1f29146825 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -3,7 +3,6 @@ #define WEAPONS_ALL_C #if defined(CSQC) - #include #include #include #include diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index 74bf35ce43..040374f4ce 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -67,6 +67,10 @@ REGISTER_WEAPON(VORTEX, vortex, NEW(Vortex)); SPAWNFUNC_WEAPON(weapon_vortex, WEP_VORTEX) SPAWNFUNC_WEAPON(weapon_nex, WEP_VORTEX) +#ifdef CSQC +bool autocvar_cl_particles_oldvortexbeam; +#endif + #ifdef SVQC .float vortex_charge_rottime; diff --git a/qcsrc/lib/csqcmodel/interpolate.qh b/qcsrc/lib/csqcmodel/interpolate.qh index 94af863400..7c6b2c3490 100644 --- a/qcsrc/lib/csqcmodel/interpolate.qh +++ b/qcsrc/lib/csqcmodel/interpolate.qh @@ -21,6 +21,8 @@ */ #pragma once +float autocvar_cl_lerpexcess; // TODO: int? + .int iflags; const int IFLAG_VELOCITY = BIT(0); const int IFLAG_ANGLES = BIT(1); diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc index df1ab6b806..26304b4f39 100644 --- a/qcsrc/lib/warpzone/client.qc +++ b/qcsrc/lib/warpzone/client.qc @@ -2,7 +2,6 @@ #include "common.qh" #if defined(CSQC) - #include #include #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 83ea702ae7..fb7112e825 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -11,7 +11,6 @@ float autocvar_bot_ai_strategyinterval_movingtarget; int autocvar_bot_vs_human; int autocvar_captureleadlimit_override; #define autocvar_capturelimit_override cvar("capturelimit_override") -float autocvar_ekg; #define autocvar_fraglimit cvar("fraglimit") #define autocvar_fraglimit_override cvar("fraglimit_override") //bool autocvar_g_allow_oldvortexbeam; -- 2.39.2