Merge branch 'master' into Mario/ctf_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / autocvars.qh

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 611564da2834ba1afb03ae9eb7a88d21913d8e5d..89f7caf780c94f2f99e7898ed94abbbd5783ea34 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1,9 +1,12 @@
-float autocvar__notarget;
-float autocvar__independent_players;
-float autocvar__campaign_testrun;
-float autocvar__campaign_index;
+#ifndef SERVER_AUTOCVARS_H
+#define SERVER_AUTOCVARS_H
+
+bool autocvar__notarget;
+bool autocvar__independent_players;
+bool autocvar__campaign_testrun;
+int autocvar__campaign_index;
 string autocvar__campaign_name;
-float autocvar__sv_init;
+bool autocvar__sv_init;
 float autocvar_bot_ai_aimskill_blendrate;
 float autocvar_bot_ai_aimskill_firetolerance_distdegrees;
 float autocvar_bot_ai_aimskill_firetolerance_maxdegrees;
@@ -43,63 +46,63 @@ float autocvar_bot_ai_navigation_jetpack;
 float autocvar_bot_ai_navigation_jetpack_mindistance;
 float autocvar_bot_ai_strategyinterval;
 float autocvar_bot_ai_thinkinterval;
-float autocvar_bot_ai_weapon_combo;
+bool autocvar_bot_ai_weapon_combo;
 float autocvar_bot_ai_weapon_combo_threshold;
 string autocvar_bot_config_file;
-float autocvar_bot_god;
-float autocvar_bot_ignore_bots;
-float autocvar_bot_join_empty;
-float autocvar_bot_navigation_ignoreplayers;
-float autocvar_bot_nofire;
+bool autocvar_bot_god;
+bool autocvar_bot_ignore_bots;
+bool autocvar_bot_join_empty;
+bool autocvar_bot_navigation_ignoreplayers;
+bool autocvar_bot_nofire;
 #define autocvar_bot_number cvar("bot_number")
 #define autocvar_bot_prefix cvar_string("bot_prefix")
-float autocvar_bot_sound_monopoly;
+bool autocvar_bot_sound_monopoly;
 #define autocvar_bot_suffix cvar_string("bot_suffix")
-float autocvar_bot_usemodelnames;
-float autocvar_bot_vs_human;
-float autocvar_bot_debug;
-float autocvar_bot_debug_tracewalk;
-float autocvar_bot_debug_goalstack;
-float autocvar_bot_wander_enable;
-float autocvar_captureleadlimit_override;
+bool autocvar_bot_usemodelnames;
+int autocvar_bot_vs_human;
+int autocvar_bot_debug;
+bool autocvar_bot_debug_tracewalk;
+bool autocvar_bot_debug_goalstack;
+bool autocvar_bot_wander_enable;
+int autocvar_captureleadlimit_override;
 #define autocvar_capturelimit_override cvar("capturelimit_override")
 #define autocvar_developer cvar("developer")
 float autocvar_ekg;
 #define autocvar_fraglimit cvar("fraglimit")
 #define autocvar_fraglimit_override cvar("fraglimit_override")
-float autocvar_g_allow_oldvortexbeam;
-float autocvar_g_antilag;
+bool autocvar_g_allow_oldvortexbeam;
+int autocvar_g_antilag;
 float autocvar_g_antilag_nudge;
 float autocvar_g_balance_armor_blockpercent;
-float autocvar_g_balance_armor_limit;
+int autocvar_g_balance_armor_limit;
 float autocvar_g_balance_armor_regen;
-float autocvar_g_balance_armor_regenlinear;
-float autocvar_g_balance_armor_regenstable;
+float autocvar_g_balance_armor_regenlinear; // TODO: int/bool?
+int autocvar_g_balance_armor_regenstable;
 float autocvar_g_balance_armor_rot;
 float autocvar_g_balance_armor_rotlinear;
-float autocvar_g_balance_armor_rotstable;
-float autocvar_g_balance_armor_start;
+int autocvar_g_balance_armor_rotstable;
+int autocvar_g_balance_armor_start;
 float autocvar_g_balance_cloaked_alpha;
 float autocvar_g_balance_contents_damagerate;
 float autocvar_g_balance_contents_drowndelay;
-float autocvar_g_balance_contents_playerdamage_drowning;
-float autocvar_g_balance_contents_playerdamage_lava;
-float autocvar_g_balance_contents_playerdamage_slime;
-float autocvar_g_balance_contents_projectiledamage;
+int autocvar_g_balance_contents_playerdamage_drowning;
+int autocvar_g_balance_contents_playerdamage_lava;
+int autocvar_g_balance_contents_playerdamage_slime;
+int autocvar_g_balance_contents_projectiledamage;
 float autocvar_g_balance_damagepush_speedfactor;
 float autocvar_g_balance_falldamage_deadminspeed;
 float autocvar_g_balance_falldamage_factor;
-float autocvar_g_balance_falldamage_maxdamage;
+int autocvar_g_balance_falldamage_maxdamage;
 float autocvar_g_balance_falldamage_minspeed;
-float autocvar_g_balance_firetransfer_damage;
-float autocvar_g_balance_firetransfer_time;
+int autocvar_g_balance_firetransfer_damage;
+int autocvar_g_balance_firetransfer_time;
 float autocvar_g_balance_fuel_limit;
 float autocvar_g_balance_fuel_regen;
 float autocvar_g_balance_fuel_regenlinear;
-float autocvar_g_balance_fuel_regenstable;
+int autocvar_g_balance_fuel_regenstable;
 float autocvar_g_balance_fuel_rot;
 float autocvar_g_balance_fuel_rotlinear;
-float autocvar_g_balance_fuel_rotstable;
+int autocvar_g_balance_fuel_rotstable;
 float autocvar_g_balance_grapplehook_airfriction;
 float autocvar_g_balance_grapplehook_force_rubber;
 float autocvar_g_balance_grapplehook_force_rubber_overstretch;
@@ -221,13 +224,13 @@ float autocvar_g_chat_flood_spl_tell;
 float autocvar_g_chat_nospectators;
 float autocvar_g_chat_teamcolors;
 float autocvar_g_chat_tellprivacy;
-float autocvar_g_ctf_allow_vehicle_carry;
-float autocvar_g_ctf_allow_vehicle_touch;
-float autocvar_g_ctf_allow_monster_touch;
-float autocvar_g_ctf_throw;
+bool autocvar_g_ctf_allow_vehicle_carry;
+bool autocvar_g_ctf_allow_vehicle_touch;
+bool autocvar_g_ctf_allow_monster_touch;
+bool autocvar_g_ctf_throw;
 float autocvar_g_ctf_throw_angle_max;
 float autocvar_g_ctf_throw_angle_min;
-float autocvar_g_ctf_throw_punish_count;
+int autocvar_g_ctf_throw_punish_count;
 float autocvar_g_ctf_throw_punish_delay;
 float autocvar_g_ctf_throw_punish_time;
 float autocvar_g_ctf_throw_strengthmultiplier;
@@ -235,9 +238,9 @@ float autocvar_g_ctf_throw_velocity_forward;
 float autocvar_g_ctf_throw_velocity_up;
 float autocvar_g_ctf_drop_velocity_up;
 float autocvar_g_ctf_drop_velocity_side;
-float autocvar_g_ctf_oneflag_reverse;
+bool autocvar_g_ctf_oneflag_reverse;
 float autocvar_g_ctf_portalteleport;
-float autocvar_g_ctf_pass;
+bool autocvar_g_ctf_pass;
 float autocvar_g_ctf_pass_arc;
 float autocvar_g_ctf_pass_arc_max;
 float autocvar_g_ctf_pass_directional_max;
@@ -248,22 +251,22 @@ float autocvar_g_ctf_pass_request;
 float autocvar_g_ctf_pass_turnrate;
 float autocvar_g_ctf_pass_timelimit;
 float autocvar_g_ctf_pass_velocity;
-float autocvar_g_ctf_dynamiclights;
+bool autocvar_g_ctf_dynamiclights;
 string autocvar_g_ctf_flag_blue_model;
-float autocvar_g_ctf_flag_blue_skin;
+int autocvar_g_ctf_flag_blue_skin;
 float autocvar_g_ctf_flag_collect_delay;
 float autocvar_g_ctf_flag_damageforcescale;
-float autocvar_g_ctf_flag_dropped_waypoint;
-float autocvar_g_ctf_flag_dropped_floatinwater;
-float autocvar_g_ctf_flag_glowtrails;
-float autocvar_g_ctf_flag_health;
+bool autocvar_g_ctf_flag_dropped_waypoint;
+bool autocvar_g_ctf_flag_dropped_floatinwater;
+bool autocvar_g_ctf_flag_glowtrails;
+int autocvar_g_ctf_flag_health;
 string autocvar_g_ctf_flag_neutral_model;
-float autocvar_g_ctf_flag_neutral_skin;
+int autocvar_g_ctf_flag_neutral_skin;
 string autocvar_g_ctf_flag_pink_model;
-float autocvar_g_ctf_flag_pink_skin;
+int autocvar_g_ctf_flag_pink_skin;
 string autocvar_g_ctf_flag_red_model;
-float autocvar_g_ctf_flag_red_skin;
-float autocvar_g_ctf_flag_return;
+int autocvar_g_ctf_flag_red_skin;
+bool autocvar_g_ctf_flag_return;
 float autocvar_g_ctf_flag_return_carried_radius;
 float autocvar_g_ctf_flag_return_time;
 float autocvar_g_ctf_flag_return_when_unreachable;
@@ -271,7 +274,7 @@ float autocvar_g_ctf_flag_return_damage;
 float autocvar_g_ctf_flag_return_damage_delay;
 float autocvar_g_ctf_flag_return_dropped;
 string autocvar_g_ctf_flag_yellow_model;
-float autocvar_g_ctf_flag_yellow_skin;
+int autocvar_g_ctf_flag_yellow_skin;
 float autocvar_g_ctf_flagcarrier_auto_helpme_damage;
 float autocvar_g_ctf_flagcarrier_auto_helpme_time;
 float autocvar_g_ctf_flagcarrier_selfdamagefactor;
@@ -279,25 +282,25 @@ float autocvar_g_ctf_flagcarrier_selfforcefactor;
 float autocvar_g_ctf_flagcarrier_damagefactor;
 float autocvar_g_ctf_flagcarrier_forcefactor;
 //float autocvar_g_ctf_flagcarrier_waypointforenemy_spotting;
-float autocvar_g_ctf_fullbrightflags;
-float autocvar_g_ctf_ignore_frags;
-float autocvar_g_ctf_score_capture;
-float autocvar_g_ctf_score_capture_assist;
-float autocvar_g_ctf_score_kill;
-float autocvar_g_ctf_score_penalty_drop;
+bool autocvar_g_ctf_fullbrightflags;
+bool autocvar_g_ctf_ignore_frags;
+int autocvar_g_ctf_score_capture;
+int autocvar_g_ctf_score_capture_assist;
+int autocvar_g_ctf_score_kill;
+int autocvar_g_ctf_score_penalty_drop;
 //float autocvar_g_ctf_score_penalty_suicidedrop;
-float autocvar_g_ctf_score_penalty_returned;
-float autocvar_g_ctf_score_pickup_base;
-float autocvar_g_ctf_score_pickup_dropped_early;
-float autocvar_g_ctf_score_pickup_dropped_late;
-float autocvar_g_ctf_score_return;
+int autocvar_g_ctf_score_penalty_returned;
+int autocvar_g_ctf_score_pickup_base;
+int autocvar_g_ctf_score_pickup_dropped_early;
+int autocvar_g_ctf_score_pickup_dropped_late;
+int autocvar_g_ctf_score_return;
 float autocvar_g_ctf_shield_force;
 float autocvar_g_ctf_shield_max_ratio;
 float autocvar_g_ctf_shield_min_negscore;
-float autocvar_g_ctf_stalemate;
-float autocvar_g_ctf_stalemate_endcondition;
+bool autocvar_g_ctf_stalemate;
+int autocvar_g_ctf_stalemate_endcondition;
 float autocvar_g_ctf_stalemate_time;
-float autocvar_g_ctf_reverse;
+bool autocvar_g_ctf_reverse;
 float autocvar_g_ctf_dropped_capture_delay;
 float autocvar_g_ctf_dropped_capture_radius;
 float autocvar_g_cts_finish_kill_delay;
@@ -410,7 +413,7 @@ float autocvar_g_instagib_invis_alpha;
 #define autocvar_g_mirrordamage cvar("g_mirrordamage")
 #define autocvar_g_mirrordamage_virtual cvar("g_mirrordamage_virtual")
 
-var float autocvar_g_movement_highspeed = 1;
+float autocvar_g_movement_highspeed = 1;
 float autocvar_g_multijump;
 float autocvar_g_multijump_add;
 float autocvar_g_multijump_speed;
@@ -593,7 +596,7 @@ float autocvar_snd_soundradius;
 float autocvar_spawn_debug;
 float autocvar_speedmeter;
 float autocvar_sv_accelerate;
-var float autocvar_sv_accuracy_data_share = 1;
+float autocvar_sv_accuracy_data_share = 1;
 string autocvar_sv_adminnick;
 float autocvar_sv_airaccel_qw;
 float autocvar_sv_airaccel_qw_stretchfactor;
@@ -805,7 +808,7 @@ float autocvar_g_nades_nade_edgedamage;
 float autocvar_g_nades_nade_radius;
 float autocvar_g_nades_nade_force;
 float autocvar_g_nades_nade_newton_style;
-float autocvar_g_nades_napalm_ball_count;
+int autocvar_g_nades_napalm_ball_count;
 float autocvar_g_nades_napalm_ball_spread;
 float autocvar_g_nades_napalm_ball_damage;
 float autocvar_g_nades_napalm_ball_damageforcescale;
@@ -889,4 +892,4 @@ float autocvar_g_buffs_vampire_damage_steal;
 float autocvar_g_buffs_invisible_alpha;
 float autocvar_g_buffs_flight_gravity;
 float autocvar_g_buffs_jump_height;
-
+#endif