X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fautocvars.qh;h=bcb9d28d70240e779e942a25b3c5764e7252298a;hb=33aeb66ca19907d4edc89593fedd11936eb4bc43;hp=f20f07047af715517e226dcad8c7f8090bedfc27;hpb=059f7f64d7c7bc3d80340fbeae6e9e2b1ee7126b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index f20f07047..bcb9d28d7 100644
--- 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,64 +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_developer_fteqccbugs;
 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;
@@ -401,7 +403,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;
@@ -427,7 +429,7 @@ float autocvar_g_nick_flood_penalty_red;
 float autocvar_g_nick_flood_penalty_yellow;
 //float autocvar_g_nick_flood_timeout;
 float autocvar_g_nix_with_healtharmor;
-float autocvar_g_nix_with_laser;
+float autocvar_g_nix_with_blaster;
 float autocvar_g_nix_with_powerups;
 float autocvar_g_nodepthtestitems;
 float autocvar_g_nodepthtestplayers;
@@ -447,7 +449,6 @@ float autocvar_g_pickup_shells_max;
 float autocvar_g_player_alpha;
 float autocvar_g_player_brightness;
 float autocvar_g_playerclip_collisions;
-string autocvar_g_playerstats_uri;
 float autocvar_g_powerups;
 float autocvar_g_projectiles_damage;
 float autocvar_g_projectiles_keep_owner;
@@ -585,7 +586,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;
@@ -797,7 +798,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;
@@ -881,4 +882,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