From: Mario Date: Sat, 24 Jan 2015 05:06:35 +0000 (+1100) Subject: Can only hope there's no mistakes in this X-Git-Tag: xonotic-v0.8.1~133^2~51 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=231a171085a2b16b93a3f91d6b533f0027490c64;p=xonotic%2Fxonotic-data.pk3dir.git Can only hope there's no mistakes in this --- diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 1355bafe7..d945eda86 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -1,98 +1,98 @@ -float autocvar__con_chat_maximized; -float autocvar__hud_configure; +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; -float autocvar_camera_chase_smoothly; -float autocvar_camera_enable; -float autocvar_camera_forward_follows; -float autocvar_camera_free; +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; -float autocvar_camera_reset; +bool autocvar_camera_reset; float autocvar_camera_speed_attenuation; float autocvar_camera_speed_chase; float autocvar_camera_speed_free; float autocvar_camera_speed_roll; -float autocvar_chase_active; -float autocvar_cl_allow_uid2name; +int autocvar_chase_active; +int autocvar_cl_allow_uid2name; string autocvar_cl_announcer; var float autocvar_cl_announcer_antispam = 2; var float autocvar_cl_announcer_maptime = 3; -float autocvar_cl_autodemo_delete; -float autocvar_cl_autodemo_delete_keeprecords; -float autocvar_cl_casings; +bool autocvar_cl_autodemo_delete; +bool autocvar_cl_autodemo_delete_keeprecords; +bool autocvar_cl_casings; float autocvar_cl_casings_bronze_time; -var float autocvar_cl_casings_maxcount = 100; +var int autocvar_cl_casings_maxcount = 100; float autocvar_cl_casings_shell_time; -var float autocvar_cl_casings_sloppy = 1; +var bool autocvar_cl_casings_sloppy = 1; var float autocvar_cl_casings_ticrate = 0.1; -float autocvar_cl_db_saveasdump; -float autocvar_cl_deathscoreboard; +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; -float autocvar_cl_effects_lightningarc_simple; -float autocvar_cl_gentle; -float autocvar_cl_gentle_damage; -float autocvar_cl_gentle_gibs; -float autocvar_cl_gentle_messages; +bool autocvar_cl_effects_lightningarc_simple; +int autocvar_cl_gentle; +int autocvar_cl_gentle_damage; +int autocvar_cl_gentle_gibs; +int autocvar_cl_gentle_messages; var float autocvar_cl_gibs_damageforcescale = 3.5; var float autocvar_cl_gibs_lifetime = 14; var float autocvar_cl_gibs_maxcount = 100; -var float autocvar_cl_gibs_sloppy = 1; +var bool autocvar_cl_gibs_sloppy = 1; var float autocvar_cl_gibs_ticrate = 0.1; var float autocvar_cl_gibs_velocity_random = 1; var float autocvar_cl_gibs_velocity_scale = 1; var float autocvar_cl_gibs_avelocity_scale = 1; float autocvar_cl_gibs_velocity_up; -float autocvar_cl_gunalign; -float autocvar_cl_hidewaypoints; -float autocvar_cl_lockview; -float autocvar_cl_nogibs; -float autocvar_cl_orthoview; -float autocvar_cl_orthoview_nofog; -float autocvar_cl_particlegibs; -float autocvar_cl_particles_oldvortexbeam; +int autocvar_cl_gunalign; +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; -float autocvar_cl_projectiles_sloppy; -float autocvar_cl_readpicture_force; -var float autocvar_cl_reticle = 1; +bool autocvar_cl_projectiles_sloppy; +bool autocvar_cl_readpicture_force; +var bool autocvar_cl_reticle = 1; var float autocvar_cl_reticle_normal_alpha = 1; -var float autocvar_cl_reticle_weapon = 1; +var bool autocvar_cl_reticle_weapon = 1; var float autocvar_cl_reticle_weapon_alpha = 1; -float autocvar_cl_reticle_stretch; -float autocvar_cl_spawn_event_particles; -var float autocvar_cl_spawn_event_sound = 1; +bool autocvar_cl_reticle_stretch; +bool autocvar_cl_spawn_event_particles; +var bool autocvar_cl_spawn_event_sound = 1; // float autocvar_cl_spawn_point_model; -float autocvar_cl_spawn_point_particles; -var float autocvar_cl_spawnzoom = 1; +bool autocvar_cl_spawn_point_particles; +var bool autocvar_cl_spawnzoom = 1; var float autocvar_cl_spawnzoom_speed = 1; var float autocvar_cl_spawnzoom_factor = 2; -float autocvar_cl_stripcolorcodes; +bool autocvar_cl_stripcolorcodes; var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6; var float autocvar_cl_vehicle_spiderbot_cross_size = 1; -var float autocvar_cl_vehicles_hud_tactical = 1; -float autocvar_cl_velocityzoom_enabled; +var bool autocvar_cl_vehicles_hud_tactical = 1; +bool autocvar_cl_velocityzoom_enabled; float autocvar_cl_velocityzoom_factor; -var float autocvar_cl_velocityzoom_type = 3; +var 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; -var float autocvar_cl_unpress_zoom_on_spawn = 1; -var float autocvar_cl_unpress_zoom_on_death = 1; -var float autocvar_cl_unpress_zoom_on_weapon_switch = 1; -var float autocvar_cl_unpress_attack_on_weapon_switch = 1; -float autocvar_con_chat; +var bool autocvar_cl_unpress_zoom_on_spawn = 1; +var bool autocvar_cl_unpress_zoom_on_death = 1; +var bool autocvar_cl_unpress_zoom_on_weapon_switch = 1; +var bool autocvar_cl_unpress_attack_on_weapon_switch = 1; +bool autocvar_con_chat; float autocvar_con_chatpos; -float autocvar_con_chatrect; +bool autocvar_con_chatrect; float autocvar_con_chatsize; float autocvar_con_chattime; float autocvar_con_notify; @@ -100,35 +100,35 @@ float autocvar_con_notifysize; string autocvar_crosshair; float autocvar_crosshair_alpha; string autocvar_crosshair_color; -float autocvar_crosshair_color_special; +int autocvar_crosshair_color_special; var float autocvar_crosshair_color_special_rainbow_brightness = 2; var float autocvar_crosshair_color_special_rainbow_delay = 0.1; -float autocvar_crosshair_dot; +bool autocvar_crosshair_dot; float autocvar_crosshair_dot_alpha; string autocvar_crosshair_dot_color; -var float autocvar_crosshair_dot_color_custom = 1; +var bool autocvar_crosshair_dot_color_custom = 1; float autocvar_crosshair_dot_size; -float autocvar_crosshair_effect_scalefade; +bool autocvar_crosshair_effect_scalefade; var float autocvar_crosshair_effect_time = 0.2; -var float autocvar_crosshair_enabled = 1; -float autocvar_crosshair_hitindication; +var 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; -float autocvar_crosshair_hittest; -float autocvar_crosshair_hittest_blur; +bool autocvar_crosshair_hittest; +bool autocvar_crosshair_hittest_blur; var float autocvar_crosshair_hittest_scale = 1.25; -float autocvar_crosshair_hittest_showimpact; -float autocvar_crosshair_per_weapon; +bool autocvar_crosshair_hittest_showimpact; +bool autocvar_crosshair_per_weapon; float autocvar_crosshair_pickup; float autocvar_crosshair_pickup_speed; -float autocvar_crosshair_ring; -float autocvar_crosshair_ring_inner; -float autocvar_crosshair_ring_minelayer; +bool autocvar_crosshair_ring; +bool autocvar_crosshair_ring_inner; +bool autocvar_crosshair_ring_minelayer; float autocvar_crosshair_ring_minelayer_alpha; -float autocvar_crosshair_ring_hagar; +bool autocvar_crosshair_ring_hagar; float autocvar_crosshair_ring_hagar_alpha; -var float autocvar_crosshair_ring_vortex = 1; +var bool autocvar_crosshair_ring_vortex = 1; var float autocvar_crosshair_ring_vortex_alpha = 0.15; var float autocvar_crosshair_ring_vortex_currentcharge_movingavg_rate = 0.05; var float autocvar_crosshair_ring_vortex_currentcharge_scale = 30; @@ -136,24 +136,24 @@ var float autocvar_crosshair_ring_vortex_inner_alpha = 0.15; var float autocvar_crosshair_ring_vortex_inner_color_blue = 0; var float autocvar_crosshair_ring_vortex_inner_color_green = 0; var float autocvar_crosshair_ring_vortex_inner_color_red = 0.8; -var float autocvar_crosshair_ring_arc = 1; +var bool autocvar_crosshair_ring_arc = 1; var vector autocvar_crosshair_ring_arc_hot_color = '1 0 0'; var float autocvar_crosshair_ring_arc_cold_alpha = 0.2; var float autocvar_crosshair_ring_arc_hot_alpha = 0.5; float autocvar_crosshair_ring_size; -float autocvar_crosshair_ring_reload; +bool autocvar_crosshair_ring_reload; float autocvar_crosshair_ring_reload_alpha; float autocvar_crosshair_ring_reload_size; float autocvar_crosshair_size; -float autocvar_ekg; +int autocvar_ekg; float autocvar_fov; float autocvar_g_balance_damagepush_speedfactor; float autocvar_g_balance_tuba_attenuation; float autocvar_g_balance_tuba_fadetime; float autocvar_g_balance_tuba_volume; -float autocvar_g_balance_tuba_pitchstep; +int autocvar_g_balance_tuba_pitchstep; // TODO: figure out if this should be bool or int float autocvar_g_warmup_limit; -float autocvar_g_waypointsprite_uppercase; +bool autocvar_g_waypointsprite_uppercase; float autocvar_g_waypointsprite_alpha; float autocvar_g_waypointsprite_crosshairfadealpha; float autocvar_g_waypointsprite_crosshairfadedistance; @@ -174,17 +174,17 @@ float autocvar_g_waypointsprite_minalpha; float autocvar_g_waypointsprite_minscale; float autocvar_g_waypointsprite_normdistance; float autocvar_g_waypointsprite_scale; -float autocvar_g_waypointsprite_spam; +int autocvar_g_waypointsprite_spam; float autocvar_g_waypointsprite_timealphaexponent; -var float autocvar_g_waypointsprite_turrets = TRUE; +var bool autocvar_g_waypointsprite_turrets = TRUE; var float autocvar_g_waypointsprite_turrets_maxdist = 5000; -var float autocvar_hud_cursormode = TRUE; +var bool autocvar_hud_cursormode = TRUE; float autocvar_hud_colorflash_alpha; -float autocvar_hud_configure_checkcollisions; -float autocvar_hud_configure_grid; +bool autocvar_hud_configure_checkcollisions; +bool autocvar_hud_configure_grid; float autocvar_hud_configure_grid_alpha; -float autocvar_hud_configure_teamcolorforced; -float autocvar_hud_contents; +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; @@ -195,7 +195,7 @@ float autocvar_hud_contents_slime_alpha; string autocvar_hud_contents_slime_color; float autocvar_hud_contents_water_alpha; string autocvar_hud_contents_water_color; -float autocvar_hud_damage; +bool autocvar_hud_damage; float autocvar_hud_damage_blur; float autocvar_hud_damage_blur_alpha; string autocvar_hud_damage_color; @@ -209,31 +209,31 @@ 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; -float autocvar_hud_powerup; -float autocvar_hud_postprocessing; +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; -float autocvar_hud_dock_color_team; -float autocvar_hud_panel_ammo; -float autocvar_hud_panel_ammo_iconalign; -float autocvar_hud_panel_ammo_maxammo; -float autocvar_hud_panel_ammo_onlycurrent; +bool autocvar_hud_dock_color_team; +bool autocvar_hud_panel_ammo; +bool autocvar_hud_panel_ammo_iconalign; // TODO: check if this should be turned into an int +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; -float autocvar_hud_panel_ammo_progressbar; +bool autocvar_hud_panel_ammo_progressbar; string autocvar_hud_panel_ammo_progressbar_name; float autocvar_hud_panel_ammo_progressbar_xoffset; -float autocvar_hud_panel_ammo_text; +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; +vector autocvar_hud_panel_bg_color; // TODO: int? +float autocvar_hud_panel_bg_color_team; // ^ float autocvar_hud_panel_bg_padding; -float autocvar_hud_panel_centerprint; +bool autocvar_hud_panel_centerprint; float autocvar_hud_panel_centerprint_align; var float autocvar_hud_panel_centerprint_fade_in = 0.2; var float autocvar_hud_panel_centerprint_fade_out = 0.5; @@ -244,113 +244,113 @@ var float autocvar_hud_panel_centerprint_fade_subsequent_passtwo = 10; var float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5; var float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75; var float autocvar_hud_panel_centerprint_fade_minfontsize = 0; -float autocvar_hud_panel_centerprint_flip; +bool autocvar_hud_panel_centerprint_flip; float autocvar_hud_panel_centerprint_fontscale; float autocvar_hud_panel_centerprint_time; -float autocvar_hud_panel_chat; -float autocvar_hud_panel_engineinfo; +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; -float autocvar_hud_panel_healtharmor; -float autocvar_hud_panel_healtharmor_baralign; -float autocvar_hud_panel_healtharmor_flip; -float autocvar_hud_panel_healtharmor_iconalign; -float autocvar_hud_panel_healtharmor_maxarmor; -float autocvar_hud_panel_healtharmor_maxhealth; -float autocvar_hud_panel_healtharmor_progressbar; +bool autocvar_hud_panel_healtharmor; +int autocvar_hud_panel_healtharmor_baralign; +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; -float autocvar_hud_panel_healtharmor_progressbar_gfx; +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; -float autocvar_hud_panel_healtharmor_text; -float autocvar_hud_panel_infomessages; -float autocvar_hud_panel_infomessages_flip; -float autocvar_hud_panel_modicons; -float autocvar_hud_panel_modicons_ca_layout; -float autocvar_hud_panel_modicons_dom_layout; -float autocvar_hud_panel_modicons_freezetag_layout; -float autocvar_hud_panel_notify; +int autocvar_hud_panel_healtharmor_text; +bool autocvar_hud_panel_infomessages; +bool autocvar_hud_panel_infomessages_flip; +bool autocvar_hud_panel_modicons; +int autocvar_hud_panel_modicons_ca_layout; +int autocvar_hud_panel_modicons_dom_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; -float autocvar_hud_panel_physics; +bool autocvar_hud_panel_physics; 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_progressbar; -float autocvar_hud_panel_physics_acceleration_vertical; -float autocvar_hud_panel_physics_baralign; -float autocvar_hud_panel_physics_flip; +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; -float autocvar_hud_panel_physics_speed_unit; -float autocvar_hud_panel_physics_speed_unit_show; -float autocvar_hud_panel_physics_speed_vertical; -float autocvar_hud_panel_physics_text; +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; -float autocvar_hud_panel_physics_topspeed; +bool autocvar_hud_panel_physics_topspeed; float autocvar_hud_panel_physics_topspeed_time; -float autocvar_hud_panel_powerups; -float autocvar_hud_panel_powerups_baralign; -float autocvar_hud_panel_powerups_flip; -float autocvar_hud_panel_powerups_iconalign; -float autocvar_hud_panel_powerups_progressbar; -float autocvar_hud_panel_buffs; +bool autocvar_hud_panel_powerups; +int autocvar_hud_panel_powerups_baralign; +bool autocvar_hud_panel_powerups_flip; +int autocvar_hud_panel_powerups_iconalign; +bool autocvar_hud_panel_powerups_progressbar; +bool autocvar_hud_panel_buffs; //float autocvar_hud_panel_buffs_iconalign; string autocvar_hud_panel_powerups_progressbar_shield; string autocvar_hud_panel_powerups_progressbar_strength; string autocvar_hud_panel_powerups_progressbar_superweapons; -float autocvar_hud_panel_powerups_text; -float autocvar_hud_panel_pressedkeys; +bool autocvar_hud_panel_powerups_text; +int autocvar_hud_panel_pressedkeys; float autocvar_hud_panel_pressedkeys_aspect; -float autocvar_hud_panel_pressedkeys_attack; -float autocvar_hud_panel_racetimer; -float autocvar_hud_panel_radar; +bool autocvar_hud_panel_pressedkeys_attack; +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; -float autocvar_hud_panel_radar_zoommode; +int autocvar_hud_panel_radar_zoommode; float autocvar_hud_panel_radar_maximized_rotation; -float autocvar_hud_panel_radar_maximized_zoommode; -float autocvar_hud_panel_score; -float autocvar_hud_panel_score_rankings; -float autocvar_hud_panel_timer; -float autocvar_hud_panel_timer_increment; +int autocvar_hud_panel_radar_maximized_zoommode; +bool autocvar_hud_panel_score; +bool autocvar_hud_panel_score_rankings; +bool autocvar_hud_panel_timer; +bool autocvar_hud_panel_timer_increment; float autocvar_hud_panel_update_interval; -float autocvar_hud_panel_vote; +bool autocvar_hud_panel_vote; float autocvar_hud_panel_vote_alreadyvoted_alpha; string autocvar_hud_panel_vote_bg_alpha; -float autocvar_hud_panel_weapons; -float autocvar_hud_panel_weapons_accuracy; -float autocvar_hud_panel_weapons_ammo; +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; -float autocvar_hud_panel_weapons_ammo_full_cells; -float autocvar_hud_panel_weapons_ammo_full_plasma; -float autocvar_hud_panel_weapons_ammo_full_fuel; -float autocvar_hud_panel_weapons_ammo_full_nails; -float autocvar_hud_panel_weapons_ammo_full_rockets; -float autocvar_hud_panel_weapons_ammo_full_shells; +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; -float autocvar_hud_panel_weapons_complainbubble; +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; -float autocvar_hud_panel_weapons_label; +int autocvar_hud_panel_weapons_label; float autocvar_hud_panel_weapons_label_scale = 0.5; -float autocvar_hud_panel_weapons_onlyowned; +bool autocvar_hud_panel_weapons_onlyowned; float autocvar_hud_panel_weapons_timeout; -float autocvar_hud_panel_weapons_timeout_effect; +int autocvar_hud_panel_weapons_timeout_effect; float autocvar_hud_panel_weapons_timeout_fadebgmin; float autocvar_hud_panel_weapons_timeout_fadefgmin; var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; @@ -366,36 +366,36 @@ vector autocvar_hud_progressbar_shield_color; vector autocvar_hud_progressbar_speed_color; vector autocvar_hud_progressbar_strength_color; vector autocvar_hud_progressbar_superweapons_color; -float autocvar_hud_showbinds; -float autocvar_hud_showbinds_limit; -float autocvar__hud_showbinds_reload; -float autocvar_hud_shownames; -float autocvar_hud_shownames_enemies; +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; -float autocvar_hud_shownames_self; -float autocvar_hud_shownames_status; +bool autocvar_hud_shownames_self; +bool autocvar_hud_shownames_status; float autocvar_hud_shownames_statusbar_height; float autocvar_hud_shownames_aspect; float autocvar_hud_shownames_fontsize; -float autocvar_hud_shownames_decolorize; +int autocvar_hud_shownames_decolorize; float autocvar_hud_shownames_alpha; -float autocvar_hud_shownames_resize; +bool autocvar_hud_shownames_resize; float autocvar_hud_shownames_mindistance; float autocvar_hud_shownames_maxdistance; -float autocvar_hud_shownames_antioverlap; +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; -float autocvar_r_fakelight; -float autocvar_r_fullbright; +int autocvar_r_fakelight; +int autocvar_r_fullbright; float autocvar_r_letterbox; -float autocvar_scoreboard_accuracy; -float autocvar_scoreboard_accuracy_doublerows; -float autocvar_scoreboard_accuracy_nocolors; +bool autocvar_scoreboard_accuracy; +bool autocvar_scoreboard_accuracy_doublerows; +bool autocvar_scoreboard_accuracy_nocolors; float autocvar_scoreboard_alpha_bg; var float autocvar_scoreboard_alpha_fg = 1.0; var float autocvar_scoreboard_alpha_name = 0.9; @@ -409,53 +409,53 @@ float autocvar_scoreboard_color_bg_team; string autocvar_scoreboard_columns; var float autocvar_scoreboard_fadeinspeed = 10; var float autocvar_scoreboard_fadeoutspeed = 5; -float autocvar_scoreboard_highlight; +bool autocvar_scoreboard_highlight; var float autocvar_scoreboard_highlight_alpha = 0.10; var float autocvar_scoreboard_highlight_alpha_self = 0.25; float autocvar_scoreboard_offset_left; float autocvar_scoreboard_offset_right; float autocvar_scoreboard_offset_vertical; float autocvar_scoreboard_respawntime_decimals; -float autocvar_v_flipped; +bool autocvar_v_flipped; float autocvar_vid_conheight; float autocvar_vid_conwidth; float autocvar_vid_pixelheight; float autocvar_viewsize; -float autocvar_cl_hitsound; -var float autocvar_cl_hitsound_min_pitch = 0.75; // minimal difference in minsta +int autocvar_cl_hitsound; +var float autocvar_cl_hitsound_min_pitch = 0.75; var float autocvar_cl_hitsound_max_pitch = 1.5; var float autocvar_cl_hitsound_nom_damage = 25; float autocvar_cl_hitsound_antispam_time; -var float autocvar_cl_eventchase_death = 1; -var float autocvar_cl_eventchase_nexball = 1; +var int autocvar_cl_eventchase_death = 1; +var int autocvar_cl_eventchase_nexball = 1; var float autocvar_cl_eventchase_distance = 140; var float autocvar_cl_eventchase_speed = 1.3; var vector autocvar_cl_eventchase_maxs = '12 12 8'; var vector autocvar_cl_eventchase_mins = '-12 -12 -8'; var vector autocvar_cl_eventchase_viewoffset = '0 0 20'; -float autocvar_cl_lerpexcess; +float autocvar_cl_lerpexcess; // TODO: int? string autocvar__togglezoom; -float autocvar_cl_damageeffect; +int autocvar_cl_damageeffect; float autocvar_cl_damageeffect_ticrate; float autocvar_cl_damageeffect_bones; -float autocvar_cl_damageeffect_distribute; +bool autocvar_cl_damageeffect_distribute; float autocvar_cl_damageeffect_lifetime; float autocvar_cl_damageeffect_lifetime_min; float autocvar_cl_damageeffect_lifetime_max; -float autocvar_cl_playerdetailreduction; -float autocvar_cl_modeldetailreduction; +int autocvar_cl_playerdetailreduction; +int autocvar_cl_modeldetailreduction; float autocvar_cl_loddistance1 = 768; float autocvar_cl_loddistance2 = 2048; -float autocvar_cl_forceplayermodels; -float autocvar_cl_forceplayercolors; +bool autocvar_cl_forceplayermodels; +bool autocvar_cl_forceplayercolors; string autocvar_cl_forcemyplayermodel; -float autocvar_cl_forcemyplayerskin; -float autocvar_cl_forcemyplayercolors; -float autocvar__cl_color; -float autocvar__cl_playerskin; +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_developer_csqcentities; +bool autocvar_developer_csqcentities; float autocvar_g_jetpack_attenuation; var string autocvar_crosshair_hmg = ""; var vector autocvar_crosshair_hmg_color = '0.2 1.0 0.2'; @@ -465,4 +465,4 @@ var string autocvar_crosshair_rpc = ""; var vector autocvar_crosshair_rpc_color = '0.2 1.0 0.2'; var float autocvar_crosshair_rpc_alpha = 1; var float autocvar_crosshair_rpc_size = 1; -float autocvar_cl_nade_timer; +int autocvar_cl_nade_timer; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 413f05cff..21dd0222b 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2671,7 +2671,7 @@ void HUD_Vote(void) float mod_active; // is there any active mod icon? -void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, float layout, float i) +void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) { float stat; string pic; @@ -2733,7 +2733,7 @@ void HUD_Mod_CA(vector myPos, vector mySize) { mod_active = 1; // required in each mod function that always shows something - float layout; + int layout; if(gametype == MAPINFO_TYPE_CA) layout = autocvar_hud_panel_modicons_ca_layout; else //if(gametype == MAPINFO_TYPE_FREEZETAG) @@ -3265,7 +3265,7 @@ void HUD_Mod_Race(vector pos, vector mySize) } } -void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, float layout, float i) +void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) { float stat, pps_ratio; string pic; @@ -3338,7 +3338,7 @@ void HUD_Mod_Dom(vector myPos, vector mySize) { mod_active = 1; // required in each mod function that always shows something - float layout = autocvar_hud_panel_modicons_dom_layout; + int layout = autocvar_hud_panel_modicons_dom_layout; float rows, columns, aspect_ratio; rows = mySize_y/mySize_x; aspect_ratio = (layout) ? 3 : 1; diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc index 868f05e26..3d5c43509 100644 --- a/qcsrc/client/movetypes.qc +++ b/qcsrc/client/movetypes.qc @@ -461,12 +461,12 @@ void Movetype_Physics_NoMatchServer() // optimized setorigin(self, self.move_origin); } -void Movetype_Physics_MatchServer(float sloppy) +void Movetype_Physics_MatchServer(bool sloppy) { Movetype_Physics_MatchTicrate(ticrate, sloppy); } -void Movetype_Physics_MatchTicrate(float tr, float sloppy) // SV_Physics_Entity +void Movetype_Physics_MatchTicrate(float tr, bool sloppy) // SV_Physics_Entity { float n, i, dt, movedt; diff --git a/qcsrc/client/movetypes.qh b/qcsrc/client/movetypes.qh index 287226e53..46b86159e 100644 --- a/qcsrc/client/movetypes.qh +++ b/qcsrc/client/movetypes.qh @@ -16,8 +16,8 @@ // should match sv_gameplayfix_fixedcheckwatertransition var float autocvar_cl_gameplayfix_fixedcheckwatertransition = 1; -void Movetype_Physics_MatchTicrate(float tr, float sloppy); -void Movetype_Physics_MatchServer(float sloppy); +void Movetype_Physics_MatchTicrate(float tr, bool sloppy); +void Movetype_Physics_MatchServer(bool sloppy); void Movetype_Physics_NoMatchServer(); const float MOVETYPE_NONE = 0;