From 2f553b6be14a316d31fe5c35df47c300ce6a1561 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 26 Oct 2020 21:14:14 +1000 Subject: [PATCH] Purge autocvars.qh from the codebase, cvars are defined in the headers of the features that use them --- qcsrc/client/autocvars.qh | 13 - qcsrc/common/effects/qc/casings.qh | 2 + qcsrc/common/effects/qc/globalsound.qh | 2 + qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh | 3 + .../gamemode/onslaught/sv_onslaught.qc | 1 + qcsrc/common/gamemodes/sv_rules.qh | 4 + qcsrc/common/items/item/ammo.qh | 1 + qcsrc/common/items/item/powerup.qh | 6 + qcsrc/common/mapobjects/func/door.qh | 3 + qcsrc/common/mapobjects/teleporters.qc | 1 - qcsrc/common/mapobjects/teleporters.qh | 6 + qcsrc/common/mapobjects/trigger/impulse.qh | 7 + qcsrc/common/minigames/sv_minigames.qh | 3 + qcsrc/common/monsters/sv_monsters.qc | 3 +- qcsrc/common/monsters/sv_monsters.qh | 28 + qcsrc/common/monsters/sv_spawn.qc | 1 - .../mutators/mutator/doublejump/doublejump.qh | 4 + .../mutators/mutator/instagib/sv_instagib.qh | 21 + .../mutators/mutator/itemstime/itemstime.qh | 4 + qcsrc/common/mutators/mutator/nades/nades.qh | 66 +++ qcsrc/common/notifications/all.qc | 1 - qcsrc/common/physics/movetypes/movetypes.qh | 5 + qcsrc/common/physics/player.qh | 44 ++ qcsrc/common/stats.qh | 39 +- qcsrc/common/turrets/sv_turrets.qc | 1 - qcsrc/common/turrets/sv_turrets.qh | 7 + qcsrc/common/util.qh | 5 +- qcsrc/common/vehicles/sv_vehicles.qc | 1 + qcsrc/common/weapons/all.qc | 1 - qcsrc/common/weapons/all.qh | 1 + qcsrc/common/weapons/weapon/tuba.qh | 2 + qcsrc/ecs/systems/sv_physics.qc | 4 + qcsrc/server/anticheat.qc | 1 - qcsrc/server/antilag.qh | 3 + qcsrc/server/autocvars.qh | 554 ------------------ qcsrc/server/bot/api.qh | 1 + qcsrc/server/bot/default/bot.qc | 1 - qcsrc/server/bot/default/cvars.qh | 7 + qcsrc/server/bot/default/waypoints.qh | 10 +- qcsrc/server/campaign.qh | 7 + qcsrc/server/chat.qh | 14 + qcsrc/server/cheats.qh | 5 +- qcsrc/server/client.qc | 3 + qcsrc/server/client.qh | 48 ++ qcsrc/server/clientkill.qh | 4 + qcsrc/server/command/banning.qh | 14 +- qcsrc/server/command/cmd.qc | 1 + qcsrc/server/command/cmd.qh | 5 + qcsrc/server/command/common.qc | 1 + qcsrc/server/command/common.qh | 8 + qcsrc/server/command/getreplies.qc | 1 + qcsrc/server/command/vote.qc | 1 + qcsrc/server/command/vote.qh | 24 +- qcsrc/server/compat/quake3.qh | 3 + qcsrc/server/damage.qc | 1 + qcsrc/server/damage.qh | 28 + qcsrc/server/gamelog.qc | 1 - qcsrc/server/gamelog.qh | 9 + qcsrc/server/hook.qh | 15 + qcsrc/server/intermission.qc | 1 + qcsrc/server/intermission.qh | 6 + qcsrc/server/ipban.qc | 1 - qcsrc/server/items/items.qh | 9 + qcsrc/server/main.qh | 16 + qcsrc/server/mapvoting.qh | 25 + qcsrc/server/player.qh | 18 + qcsrc/server/portals.qh | 3 + qcsrc/server/race.qh | 2 + qcsrc/server/resources.qc | 1 - qcsrc/server/resources.qh | 28 + qcsrc/server/scores.qh | 2 + qcsrc/server/spawnpoints.qh | 6 + qcsrc/server/teamplay.qc | 2 + qcsrc/server/teamplay.qh | 2 + qcsrc/server/tests.qh | 2 +- qcsrc/server/weapons/accuracy.qh | 2 + qcsrc/server/weapons/common.qh | 5 + qcsrc/server/weapons/hitplot.qh | 3 + qcsrc/server/weapons/selection.qh | 4 + qcsrc/server/weapons/throwing.qh | 2 + qcsrc/server/weapons/tracing.qh | 12 + qcsrc/server/weapons/weaponstats.qh | 2 + qcsrc/server/weapons/weaponsystem.qh | 6 + qcsrc/server/world.qc | 1 + qcsrc/server/world.qh | 25 + 85 files changed, 649 insertions(+), 597 deletions(-) delete mode 100644 qcsrc/client/autocvars.qh delete mode 100644 qcsrc/server/autocvars.qh diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh deleted file mode 100644 index 59d3a3124..000000000 --- a/qcsrc/client/autocvars.qh +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - - - - - - - - - - - - diff --git a/qcsrc/common/effects/qc/casings.qh b/qcsrc/common/effects/qc/casings.qh index 2dac5f652..25f1087e4 100644 --- a/qcsrc/common/effects/qc/casings.qh +++ b/qcsrc/common/effects/qc/casings.qh @@ -9,5 +9,7 @@ float autocvar_cl_casings_ticrate = 0.1; #endif #ifdef SVQC +int autocvar_g_casings; + 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/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index cec501c55..af98a24d0 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -7,6 +7,8 @@ #ifdef SVQC /** Use new sound handling. TODO: use when sounds play correctly on clients */ bool autocvar_g_debug_globalsounds = false; + bool autocvar_sv_taunt; + bool autocvar_sv_autotaunt; #endif // player sounds, voice messages diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh index 9fe2f0a54..58954905c 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh @@ -8,6 +8,9 @@ void ctf_Initialize(); +int autocvar_captureleadlimit_override; +int autocvar_capturelimit_override; + REGISTER_MUTATOR(ctf, false) { MUTATOR_STATIC(); diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 6240975d7..c9f2ea740 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -3,6 +3,7 @@ #include "sv_generator.qh" #include +#include #include #include #include diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh index 1b0f8a7bd..34f2f921c 100644 --- a/qcsrc/common/gamemodes/sv_rules.qh +++ b/qcsrc/common/gamemodes/sv_rules.qh @@ -1,5 +1,9 @@ #pragma once +//int autocvar_leadlimit; +int autocvar_leadlimit_and_fraglimit; +int autocvar_leadlimit_override; + // TODO: find a better location for these? int total_players; diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 187080b37..02857d8ae 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -3,6 +3,7 @@ #include "pickup.qh" #include #ifdef SVQC + #include #include #include #endif diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh index bf4727a79..76a17af25 100644 --- a/qcsrc/common/items/item/powerup.qh +++ b/qcsrc/common/items/item/powerup.qh @@ -23,6 +23,10 @@ SOUND(Strength, Item_Sound("powerup")); #endif #ifdef SVQC +float autocvar_g_balance_powerup_strength_damage; +float autocvar_g_balance_powerup_strength_force; +float autocvar_g_balance_powerup_strength_selfdamage; +float autocvar_g_balance_powerup_strength_selfforce; float autocvar_g_balance_powerup_strength_time; void powerup_strength_init(Pickup this, entity item) { @@ -61,6 +65,8 @@ SOUND(Shield, Item_Sound("powerup_shield")); #endif #ifdef SVQC +float autocvar_g_balance_powerup_invincible_takedamage; +float autocvar_g_balance_powerup_invincible_takeforce = 0.33; float autocvar_g_balance_powerup_invincible_time; void powerup_shield_init(Pickup this, entity item) { diff --git a/qcsrc/common/mapobjects/func/door.qh b/qcsrc/common/mapobjects/func/door.qh index 181de8b7b..f185f4be8 100644 --- a/qcsrc/common/mapobjects/func/door.qh +++ b/qcsrc/common/mapobjects/func/door.qh @@ -1,5 +1,8 @@ #pragma once +#ifdef SVQC +bool autocvar_sv_doors_always_open; +#endif const int DOOR_START_OPEN = BIT(0); const int DOOR_DONT_LINK = BIT(2); diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc index 7c0ea1225..c8f9ad245 100644 --- a/qcsrc/common/mapobjects/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -16,7 +16,6 @@ #include #include #include - #include #include #endif diff --git a/qcsrc/common/mapobjects/teleporters.qh b/qcsrc/common/mapobjects/teleporters.qh index 10c4fdfaf..5ff41f013 100644 --- a/qcsrc/common/mapobjects/teleporters.qh +++ b/qcsrc/common/mapobjects/teleporters.qh @@ -1,6 +1,12 @@ #pragma once #include "defs.qh" +#ifdef SVQC +bool autocvar_g_telefrags; +bool autocvar_g_telefrags_avoid; +bool autocvar_g_telefrags_teamplay; +#endif + IntrusiveList g_teleporters; STATIC_INIT(g_teleporters) { g_teleporters = IL_NEW(); } diff --git a/qcsrc/common/mapobjects/trigger/impulse.qh b/qcsrc/common/mapobjects/trigger/impulse.qh index e86de4a49..8d4d078fb 100644 --- a/qcsrc/common/mapobjects/trigger/impulse.qh +++ b/qcsrc/common/mapobjects/trigger/impulse.qh @@ -1,5 +1,12 @@ #pragma once +#ifdef SVQC +float autocvar_g_triggerimpulse_accel_multiplier; +float autocvar_g_triggerimpulse_accel_power; +float autocvar_g_triggerimpulse_directional_multiplier; +float autocvar_g_triggerimpulse_radial_multiplier; +#endif + // tZorks trigger impulse / gravity .float radius; .int falloff; diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh index 28a524d04..06f16a9dc 100644 --- a/qcsrc/common/minigames/sv_minigames.qh +++ b/qcsrc/common/minigames/sv_minigames.qh @@ -1,5 +1,8 @@ #pragma once +bool autocvar_sv_minigames; +bool autocvar_sv_minigames_observer; + /// Create a new minigame session /// \return minigame session entity entity start_minigame(entity player, string minigame ); diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 5ebf5761f..0ce51f21a 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -17,9 +18,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh index b6cab12b6..89541935b 100644 --- a/qcsrc/common/monsters/sv_monsters.qh +++ b/qcsrc/common/monsters/sv_monsters.qh @@ -2,6 +2,34 @@ #include "all.qh" +float autocvar_g_monsters; +bool autocvar_g_monsters_edit; +bool autocvar_g_monsters_sounds; +float autocvar_g_monsters_think_delay; +int autocvar_g_monsters_max; +int autocvar_g_monsters_max_perplayer; +float autocvar_g_monsters_damageforcescale = 0.8; +float autocvar_g_monsters_target_range; +bool autocvar_g_monsters_target_infront; +float autocvar_g_monsters_target_infront_range = 0.3; +float autocvar_g_monsters_attack_range; +int autocvar_g_monsters_score_kill; +int autocvar_g_monsters_score_spawned; +bool autocvar_g_monsters_typefrag; +bool autocvar_g_monsters_owners; +float autocvar_g_monsters_miniboss_chance; +float autocvar_g_monsters_miniboss_healthboost; +float autocvar_g_monsters_drop_time; +float autocvar_g_monsters_spawnshieldtime; +bool autocvar_g_monsters_quake_resize = true; +bool autocvar_g_monsters_teams; +float autocvar_g_monsters_respawn_delay; +bool autocvar_g_monsters_respawn; +float autocvar_g_monsters_armor_blockpercent; +float autocvar_g_monsters_healthbars; +bool autocvar_g_monsters_lineofsight = true; +//bool autocvar_g_monsters_ignoretraces = true; + // stats networking int monsters_total; int monsters_killed; diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc index 54fc4154e..0a5f350ee 100644 --- a/qcsrc/common/monsters/sv_spawn.qc +++ b/qcsrc/common/monsters/sv_spawn.qc @@ -8,7 +8,6 @@ #include #include #include - #include #include #endif diff --git a/qcsrc/common/mutators/mutator/doublejump/doublejump.qh b/qcsrc/common/mutators/mutator/doublejump/doublejump.qh index 6f70f09be..35aa7fc8c 100644 --- a/qcsrc/common/mutators/mutator/doublejump/doublejump.qh +++ b/qcsrc/common/mutators/mutator/doublejump/doublejump.qh @@ -1 +1,5 @@ #pragma once + +#ifdef SVQC +bool autocvar_sv_doublejump; +#endif diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh index 723a3ccbc..b3216cdcc 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qh @@ -3,6 +3,27 @@ #include "items.qh" #include +// TODO: make this its own mutator (somehow)! +float autocvar_g_rm; +float autocvar_g_rm_damage; +float autocvar_g_rm_edgedamage; +float autocvar_g_rm_force; +float autocvar_g_rm_radius; +float autocvar_g_rm_laser; +float autocvar_g_rm_laser_count; +float autocvar_g_rm_laser_speed; +float autocvar_g_rm_laser_spread; +float autocvar_g_rm_laser_spread_random; +float autocvar_g_rm_laser_lifetime; +float autocvar_g_rm_laser_damage; +float autocvar_g_rm_laser_refire; +float autocvar_g_rm_laser_rapid; +float autocvar_g_rm_laser_rapid_refire; +float autocvar_g_rm_laser_rapid_delay; +float autocvar_g_rm_laser_radius; +float autocvar_g_rm_laser_force; + +bool autocvar_g_instagib; float autocvar_g_instagib_invis_alpha; int autocvar_g_instagib_extralives; diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qh b/qcsrc/common/mutators/mutator/itemstime/itemstime.qh index 6f70f09be..abbb1de48 100644 --- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qh +++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qh @@ -1 +1,5 @@ #pragma once + +#ifdef SVQC +int autocvar_sv_itemstime; +#endif diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh index 963dbce38..c07882270 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qh +++ b/qcsrc/common/mutators/mutator/nades/nades.qh @@ -2,6 +2,72 @@ #include +#ifdef SVQC +bool autocvar_g_nades; +bool autocvar_g_nades_override_dropweapon = true; +vector autocvar_g_nades_throw_offset; +bool autocvar_g_nades_spawn; +int autocvar_g_nades_spawn_count; +bool autocvar_g_nades_client_select; +bool autocvar_g_nades_pickup = true; +float autocvar_g_nades_pickup_time = 2; +float autocvar_g_nades_nade_lifetime; +float autocvar_g_nades_nade_minforce; +float autocvar_g_nades_nade_maxforce; +float autocvar_g_nades_nade_health; +float autocvar_g_nades_nade_refire; +float autocvar_g_nades_nade_damage; +float autocvar_g_nades_nade_edgedamage; +float autocvar_g_nades_nade_radius; +float autocvar_g_nades_nade_force; +int autocvar_g_nades_nade_newton_style; +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; +float autocvar_g_nades_napalm_ball_lifetime; +float autocvar_g_nades_napalm_ball_radius; +bool autocvar_g_nades_napalm_blast; +float autocvar_g_nades_napalm_fountain_lifetime; +float autocvar_g_nades_napalm_fountain_delay; +float autocvar_g_nades_napalm_fountain_radius; +float autocvar_g_nades_napalm_fountain_damage; +float autocvar_g_nades_napalm_fountain_edgedamage; +float autocvar_g_nades_napalm_burntime; +bool autocvar_g_nades_napalm_selfdamage; +int autocvar_g_nades_nade_type; +int autocvar_g_nades_bonus_type; +bool autocvar_g_nades_bonus; +bool autocvar_g_nades_bonus_onstrength; +bool autocvar_g_nades_bonus_client_select; +bool autocvar_g_nades_bonus_only; +int autocvar_g_nades_bonus_max; +int autocvar_g_nades_bonus_score_max; +int autocvar_g_nades_bonus_score_time; +int autocvar_g_nades_bonus_score_time_flagcarrier; +int autocvar_g_nades_bonus_score_minor; +int autocvar_g_nades_bonus_score_low; +int autocvar_g_nades_bonus_score_high; +int autocvar_g_nades_bonus_score_medium; +int autocvar_g_nades_bonus_score_spree; +float autocvar_g_nades_ice_freeze_time; +float autocvar_g_nades_ice_health; +bool autocvar_g_nades_ice_explode; +bool autocvar_g_nades_ice_teamcheck; +float autocvar_g_nades_heal_time; +float autocvar_g_nades_heal_rate; +float autocvar_g_nades_heal_friend; +float autocvar_g_nades_heal_foe; +float autocvar_g_nades_entrap_strength = 0.01; +float autocvar_g_nades_entrap_speed = 0.5; +float autocvar_g_nades_entrap_radius = 500; +float autocvar_g_nades_entrap_time = 10; +float autocvar_g_nades_veil_time = 8; +float autocvar_g_nades_veil_radius = 300; +string autocvar_g_nades_pokenade_monster_type; +float autocvar_g_nades_pokenade_monster_lifetime; +#endif + // use slots 70-100 const int PROJECTILE_NADE = 71; const int PROJECTILE_NADE_BURN = 72; diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 372d963d7..b2e278a18 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -7,7 +7,6 @@ #include #include #include - #include #include #include #include diff --git a/qcsrc/common/physics/movetypes/movetypes.qh b/qcsrc/common/physics/movetypes/movetypes.qh index 444e7f442..d3de0ba9c 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qh +++ b/qcsrc/common/physics/movetypes/movetypes.qh @@ -1,5 +1,10 @@ #pragma once +#ifdef SVQC +// undefined on client, engine cvar +bool autocvar_physics_ode; +#endif + // water levels const int WATERLEVEL_NONE = 0; const int WATERLEVEL_WETFEET = 1; diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index ebabee158..67c70c4b0 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -5,6 +5,50 @@ #ifdef SVQC // TODO: get rid of this random dumb include! #include + +float autocvar_sv_airaccel_qw; +float autocvar_sv_airstrafeaccel_qw; +float autocvar_sv_airspeedlimit_nonqw; +float autocvar_sv_airaccel_qw_stretchfactor; +float autocvar_sv_maxairstrafespeed; +float autocvar_sv_airstrafeaccelerate; +float autocvar_sv_warsowbunny_turnaccel; +float autocvar_sv_airaccel_sideways_friction; +float autocvar_sv_aircontrol; +float autocvar_sv_aircontrol_power; +float autocvar_sv_aircontrol_backwards; +float autocvar_sv_aircontrol_sidewards; +float autocvar_sv_aircontrol_penalty; +float autocvar_sv_warsowbunny_airforwardaccel; +float autocvar_sv_warsowbunny_topspeed; +float autocvar_sv_warsowbunny_accel; +float autocvar_sv_warsowbunny_backtosideratio; +float autocvar_sv_friction; +float autocvar_sv_accelerate; +float autocvar_sv_stopspeed; +float autocvar_sv_airaccelerate; +float autocvar_sv_airstopaccelerate; +float autocvar_sv_track_canjump; +string autocvar_g_physics_clientselect_options; +string autocvar_g_physics_clientselect_default; +bool autocvar_g_jump_grunt; +bool autocvar_g_physics_clientselect; +float autocvar_g_maxspeed; +float autocvar_g_movement_highspeed = 1; +bool autocvar_g_movement_highspeed_q3_compat = 0; +//float autocvar_g_nick_flood_penalty; +int autocvar_g_nick_flood_penalty_red; +int autocvar_g_nick_flood_penalty_yellow; +//float autocvar_g_nick_flood_timeout; +bool autocvar_speedmeter; +string autocvar_sv_jumpspeedcap_max; +float autocvar_sv_jumpspeedcap_max_disable_on_ramps; +string autocvar_sv_jumpspeedcap_min; +float autocvar_sv_jumpvelocity; +float autocvar_sv_jumpvelocity_crouch; +float autocvar_sv_maxairspeed; +float autocvar_sv_maxspeed; +bool autocvar_g_footsteps; #endif .entity conveyor; diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index cda98d54d..67f7fd60c 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -1,9 +1,16 @@ #pragma once +// you're next + #ifdef SVQC -#include #include +#include +#include +#include #include +#include +#include +#include #endif // Full list of all stat constants, included in a single location for easy reference @@ -68,6 +75,11 @@ float game_starttime; //point in time when the countdown to game start is over float round_starttime; //point in time when the countdown to round start is over bool autocvar_g_allow_oldvortexbeam; int autocvar_leadlimit; +// TODO: world.qh can't be included here due to circular includes! +#define autocvar_fraglimit cvar("fraglimit") +#define autocvar_fraglimit_override cvar("fraglimit_override") +#define autocvar_timelimit cvar("timelimit") +#define autocvar_timelimit_override cvar("timelimit_override") #endif REGISTER_STAT(WEAPONRATEFACTOR, float, W_WeaponRateFactor(this)) REGISTER_STAT(GAME_STOPPED, int, game_stopped) @@ -201,6 +213,7 @@ int autocvar_sv_gameplayfix_grenadebouncedownslopes = 1; int autocvar_sv_gameplayfix_noairborncorpse = 1; int autocvar_sv_gameplayfix_noairborncorpse_allowsuspendeditems = 1; int autocvar_sv_gameplayfix_delayprojectiles = 0; +bool autocvar_sv_gameplayfix_upwardvelocityclearsongroundflag = true; #endif REGISTER_STAT(GAMEPLAYFIX_DOWNTRACEONGROUND, int, autocvar_sv_gameplayfix_downtracesupportsongroundflag) REGISTER_STAT(GAMEPLAYFIX_EASIERWATERJUMP, int, autocvar_sv_gameplayfix_easierwaterjump) @@ -219,6 +232,10 @@ REGISTER_STAT(GAMEPLAYFIX_DELAYPROJECTILES, int, autocvar_sv_gameplayfix_delaypr REGISTER_STAT(MOVEVARS_JUMPSTEP, int, cvar("sv_jumpstep")) REGISTER_STAT(NOSTEP, int, cvar("sv_nostep")) +#ifdef SVQC +float autocvar_sv_friction_on_land; +var float autocvar_sv_friction_slick = 0.5; +#endif REGISTER_STAT(MOVEVARS_FRICTION, float) REGISTER_STAT(MOVEVARS_FRICTION_SLICK, float, autocvar_sv_friction_slick) REGISTER_STAT(MOVEVARS_FRICTION_ONLAND, float, autocvar_sv_friction_on_land) @@ -272,6 +289,15 @@ REGISTER_STAT(DODGING_CLIENTSELECT, bool, autocvar_sv_dodging_clientselect) REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen) REGISTER_STAT(DODGING_TIMEOUT, float) +#ifdef SVQC +float autocvar_g_jetpack_acceleration_side; +float autocvar_g_jetpack_acceleration_up; +float autocvar_g_jetpack_antigravity; +int autocvar_g_jetpack_fuel; +float autocvar_g_jetpack_maxspeed_side; +float autocvar_g_jetpack_maxspeed_up; +float autocvar_g_jetpack_reverse_thrust; +#endif REGISTER_STAT(JETPACK_ACCEL_SIDE, float, autocvar_g_jetpack_acceleration_side) REGISTER_STAT(JETPACK_ACCEL_UP, float, autocvar_g_jetpack_acceleration_up) REGISTER_STAT(JETPACK_ANTIGRAVITY, float, autocvar_g_jetpack_antigravity) @@ -314,6 +340,9 @@ REGISTER_STAT(DOM_PPS_BLUE, float) REGISTER_STAT(DOM_PPS_YELLOW, float) REGISTER_STAT(DOM_PPS_PINK, float) +#ifdef SVQC +float autocvar_g_teleport_maxspeed; +#endif REGISTER_STAT(TELEPORT_MAXSPEED, float, autocvar_g_teleport_maxspeed) REGISTER_STAT(TELEPORT_TELEFRAG_AVOID, int, autocvar_g_telefrags_avoid) @@ -350,7 +379,11 @@ REGISTER_STAT(MOVEVARS_AIRSTRAFEACCEL_QW, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_POWER, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_BACKWARDS, bool) REGISTER_STAT(MOVEVARS_AIRCONTROL_SIDEWARDS, bool) -noref bool autocvar_sv_gameplayfix_nogravityonground = true; +#ifdef SVQC +float autocvar_sv_gameplayfix_q2airaccelerate = 1; +bool autocvar_sv_gameplayfix_nogravityonground = true; +bool autocvar_sv_gameplayfix_gravityunaffectedbyticrate = true; +#endif REGISTER_STAT(MOVEFLAGS, int, MOVEFLAG_VALID | (autocvar_sv_gameplayfix_q2airaccelerate ? MOVEFLAG_Q2AIRACCELERATE : 0) | (autocvar_sv_gameplayfix_nogravityonground ? MOVEFLAG_NOGRAVITYONGROUND : 0) @@ -371,6 +404,8 @@ REGISTER_STAT(TIMELIMIT, float, autocvar_timelimit) REGISTER_STAT(WARMUP_TIMELIMIT, float, warmup_limit) #ifdef SVQC float autocvar_sv_wallfriction; +#define autocvar_sv_gravity cvar("sv_gravity") +float autocvar_sv_stepheight; #endif REGISTER_STAT(MOVEVARS_WALLFRICTION, int, autocvar_sv_wallfriction) REGISTER_STAT(MOVEVARS_TICRATE, float, autocvar_sys_ticrate) diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index 1900def33..180981d8c 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -2,7 +2,6 @@ #ifdef SVQC #include -#include #include #include #include diff --git a/qcsrc/common/turrets/sv_turrets.qh b/qcsrc/common/turrets/sv_turrets.qh index aec6045ae..cdd9e57bf 100644 --- a/qcsrc/common/turrets/sv_turrets.qh +++ b/qcsrc/common/turrets/sv_turrets.qh @@ -2,6 +2,13 @@ #include "all.qh" +bool autocvar_g_turrets; +float autocvar_g_turrets_aimidle_delay; +bool autocvar_g_turrets_nofire; +bool autocvar_g_turrets_reloadcvars; +float autocvar_g_turrets_targetscan_maxdelay; +float autocvar_g_turrets_targetscan_mindelay; + entity turret_projectile(entity actor, Sound _snd, float _size, float _health, float _death, float _proj_type, float _cull, float _cli_anim); void turret_projectile_explode(entity this); float turret_validate_target(entity e_turret, entity e_target, float validate_flags); diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index ac866bacc..7db9dcc6a 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -1,9 +1,5 @@ #pragma once -#ifdef SVQC - #include -#endif - #ifdef SVQC float tracebox_inverted (vector v1, vector mi, vector ma, vector v2, float nomonsters, entity forent, float stopatentity, entity ignorestopatentity); // returns the number of traces done, for benchmarking @@ -201,6 +197,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t int autocvar_cl_gentle_messages; #define GENTLE (autocvar_cl_gentle || autocvar_cl_gentle_messages) #else + int autocvar_sv_gentle; #define GENTLE autocvar_sv_gentle #endif #define normal_or_gentle(normal, gentle) ((GENTLE && (gentle != "")) ? gentle : normal) diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index e12304193..8adfb4f0c 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 1f2914682..50ee6a2ab 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -37,7 +37,6 @@ #include #include #include - #include #include #include #include diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 2a7ed0beb..479c0b6b3 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -381,6 +381,7 @@ ENUMCLASS_END(WFRAME) .WFRAME wframe; #ifdef SVQC + string autocvar_g_shootfromfixedorigin; #define G_SHOOTFROMFIXEDORIGIN autocvar_g_shootfromfixedorigin #elif defined(CSQC) string autocvar_cl_shootfromfixedorigin; diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh index 335326514..8855fc752 100644 --- a/qcsrc/common/weapons/weapon/tuba.qh +++ b/qcsrc/common/weapons/weapon/tuba.qh @@ -53,5 +53,7 @@ classfield(Tuba) .int tuba_instrument; #endif #ifdef SVQC +float autocvar_snd_soundradius; + bool W_Tuba_HasPlayed(entity pl, .entity weaponentity, string melody, int instrument, bool ignorepitch, float mintempo, float maxtempo); #endif diff --git a/qcsrc/ecs/systems/sv_physics.qc b/qcsrc/ecs/systems/sv_physics.qc index 313040126..0d50baac5 100644 --- a/qcsrc/ecs/systems/sv_physics.qc +++ b/qcsrc/ecs/systems/sv_physics.qc @@ -1,5 +1,9 @@ #include "physics.qh" +float autocvar_sv_spectator_speed_multiplier; +float autocvar_sv_spectator_speed_multiplier_min = 1; +float autocvar_sv_spectator_speed_multiplier_max = 5; + void sys_phys_fix(entity this, float dt) { WarpZone_PlayerPhysics_FixVAngle(this); diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc index 7567563e9..48c252def 100644 --- a/qcsrc/server/anticheat.qc +++ b/qcsrc/server/anticheat.qc @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/antilag.qh b/qcsrc/server/antilag.qh index f02803387..ed8f6b330 100644 --- a/qcsrc/server/antilag.qh +++ b/qcsrc/server/antilag.qh @@ -1,5 +1,8 @@ #pragma once +int autocvar_g_antilag; +float autocvar_g_antilag_nudge; + void antilag_record(entity e, entity store, float t); vector antilag_takebackorigin(entity e, entity store, float t); void antilag_takeback(entity e, entity store, float t); diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh deleted file mode 100644 index fb7112e82..000000000 --- a/qcsrc/server/autocvars.qh +++ /dev/null @@ -1,554 +0,0 @@ -#pragma once - -bool autocvar__notarget; -bool autocvar__campaign_testrun; -int autocvar__campaign_index; -string autocvar__campaign_name; -bool autocvar__sv_init; -float autocvar_bot_ai_strategyinterval; -float autocvar_bot_ai_strategyinterval_movingtarget; -#define autocvar_bot_number cvar("bot_number") -int autocvar_bot_vs_human; -int autocvar_captureleadlimit_override; -#define autocvar_capturelimit_override cvar("capturelimit_override") -#define autocvar_fraglimit cvar("fraglimit") -#define autocvar_fraglimit_override cvar("fraglimit_override") -//bool autocvar_g_allow_oldvortexbeam; -int autocvar_g_antilag; -float autocvar_g_antilag_nudge; -float autocvar_g_balance_armor_blockpercent; -int autocvar_g_balance_armor_limit; -float autocvar_g_balance_armor_regen; -float autocvar_g_balance_armor_regenlinear; -int autocvar_g_balance_armor_regenstable; -float autocvar_g_balance_armor_rot; -float autocvar_g_balance_armor_rotlinear; -int autocvar_g_balance_armor_rotstable; -int autocvar_g_balance_armor_start; -float autocvar_g_balance_contents_damagerate; -float autocvar_g_balance_contents_drowndelay; -int autocvar_g_balance_contents_playerdamage_drowning; -int autocvar_g_balance_contents_playerdamage_lava; -int autocvar_g_balance_contents_playerdamage_lava_burn; // 10 is a nice value -float autocvar_g_balance_contents_playerdamage_lava_burn_time = 2.5; // note: damage is total across this time (not by dps) -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; -int autocvar_g_balance_falldamage_maxdamage; -float autocvar_g_balance_falldamage_minspeed; -bool autocvar_g_balance_falldamage_onlyvertical; -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; -int autocvar_g_balance_fuel_regenstable; -float autocvar_g_balance_fuel_rot; -float autocvar_g_balance_fuel_rotlinear; -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; -float autocvar_g_balance_grapplehook_health; -float autocvar_g_balance_grapplehook_length_min; -float autocvar_g_balance_grapplehook_speed_fly; -float autocvar_g_balance_grapplehook_speed_pull; -float autocvar_g_balance_grapplehook_stretch; -float autocvar_g_balance_grapplehook_damagedbycontents; -float autocvar_g_balance_grapplehook_refire; -float autocvar_g_balance_health_limit; -float autocvar_g_balance_health_regen; -float autocvar_g_balance_health_regenlinear; -float autocvar_g_balance_health_regenstable; -float autocvar_g_balance_health_rot; -float autocvar_g_balance_health_rotlinear; -float autocvar_g_balance_health_rotstable; -float autocvar_g_balance_kill_delay; -float autocvar_g_balance_kill_antispam; -float autocvar_g_balance_pause_armor_rot; -float autocvar_g_balance_pause_armor_rot_spawn; -float autocvar_g_balance_pause_fuel_regen; -float autocvar_g_balance_pause_fuel_rot; -float autocvar_g_balance_pause_fuel_rot_spawn; -float autocvar_g_balance_pause_health_regen; -float autocvar_g_balance_pause_health_regen_spawn; -float autocvar_g_balance_pause_health_rot; -float autocvar_g_balance_pause_health_rot_spawn; -float autocvar_g_balance_portal_health; -float autocvar_g_balance_portal_lifetime; -float autocvar_g_balance_powerup_invincible_takedamage; -float autocvar_g_balance_powerup_invincible_takeforce = 0.33; -//float autocvar_g_balance_powerup_invincible_time; -float autocvar_g_balance_powerup_strength_damage; -float autocvar_g_balance_powerup_strength_force; -float autocvar_g_balance_powerup_strength_selfdamage; -float autocvar_g_balance_powerup_strength_selfforce; -//float autocvar_g_balance_powerup_strength_time; -float autocvar_g_balance_superweapons_time; -float autocvar_g_balance_selfdamagepercent; -float autocvar_g_ballistics_density_corpse; -float autocvar_g_ballistics_density_player; -float autocvar_g_ballistics_mindistance; -bool autocvar_g_ballistics_penetrate_clips = true; -float autocvar_g_ballistics_solidpenetration_exponent = 1; -float autocvar_g_ban_default_bantime; -float autocvar_g_ban_default_masksize; -float autocvar_g_ban_sync_interval; -float autocvar_g_ban_sync_timeout; -string autocvar_g_ban_sync_trusted_servers; -bool autocvar_g_ban_sync_trusted_servers_verify; -string autocvar_g_ban_sync_uri; -bool autocvar_g_ban_telluser = true; -string autocvar_g_banned_list; -bool autocvar_g_banned_list_idmode; -bool autocvar_g_botclip_collisions; -bool autocvar_g_campaign; -#define autocvar_g_campaign_forceteam cvar("g_campaign_forceteam") -int autocvar_g_campaign_skill; -int autocvar_g_casings; -float autocvar_g_chat_flood_burst; -float autocvar_g_chat_flood_burst_team; -float autocvar_g_chat_flood_burst_tell; -float autocvar_g_chat_flood_lmax; -float autocvar_g_chat_flood_lmax_team; -float autocvar_g_chat_flood_lmax_tell; -bool autocvar_g_chat_flood_notify_flooder; -float autocvar_g_chat_flood_spl; -float autocvar_g_chat_flood_spl_team; -float autocvar_g_chat_flood_spl_tell; -int autocvar_g_chat_nospectators; -bool autocvar_g_chat_teamcolors; -bool autocvar_g_chat_tellprivacy; -bool autocvar_g_forced_respawn; -string autocvar_g_forced_team_otherwise; // TODO: Move to teamplay.qc -#define autocvar_g_friendlyfire cvar("g_friendlyfire") -#define autocvar_g_friendlyfire_virtual cvar("g_friendlyfire_virtual") -#define autocvar_g_friendlyfire_virtual_force cvar("g_friendlyfire_virtual_force") -bool autocvar_g_full_getstatus_responses; -bool autocvar_g_fullbrightitems; -bool autocvar_g_fullbrightplayers; -int autocvar_g_balance_grapplehook_pull_frozen; -float autocvar_g_balance_grapplehook_nade_time; -bool autocvar_g_balance_grapplehook_gravity; -bool autocvar_g_balance_grapplehook_crouchslide; -bool autocvar_g_hitplots; -string autocvar_g_hitplots_individuals; -float autocvar_g_jetpack_acceleration_side; -float autocvar_g_jetpack_acceleration_up; -float autocvar_g_jetpack_antigravity; -int autocvar_g_jetpack_fuel; -float autocvar_g_jetpack_maxspeed_side; -float autocvar_g_jetpack_maxspeed_up; -float autocvar_g_jetpack_reverse_thrust; -#define autocvar_g_maplist cvar_string("g_maplist") -bool autocvar_g_maplist_check_waypoints; -int autocvar_g_maplist_index; -string autocvar_g_maplist_mostrecent; -int autocvar_g_maplist_mostrecent_count; -bool autocvar_g_maplist_selectrandom; -float autocvar_g_maplist_shuffle; -#define autocvar_g_maplist_votable cvar("g_maplist_votable") -bool autocvar_g_maplist_votable_abstain; -float autocvar_g_maplist_votable_keeptwotime; -bool autocvar_g_maplist_votable_nodetail; -string autocvar_g_maplist_votable_screenshot_dir; -bool autocvar_g_maplist_votable_suggestions; -bool autocvar_g_maplist_votable_suggestions_override_mostrecent; -float autocvar_g_maplist_votable_timeout; -bool autocvar_g_maplist_ignore_sizes; -bool autocvar_g_maplist_sizes_count_maxplayers = true; -bool autocvar_g_maplist_sizes_count_bots = true; -int autocvar_g_maxplayers; -float autocvar_g_maxplayers_spectator_blocktime; -float autocvar_g_maxpushtime; -float autocvar_g_maxspeed; -#define autocvar_g_instagib cvar("g_instagib") -#define autocvar_g_mirrordamage cvar("g_mirrordamage") -#define autocvar_g_mirrordamage_virtual cvar("g_mirrordamage_virtual") -bool autocvar_g_mirrordamage_onlyweapons; - -float autocvar_g_movement_highspeed = 1; -bool autocvar_g_movement_highspeed_q3_compat = 0; -string autocvar_g_mutatormsg; -//float autocvar_g_nick_flood_penalty; -int autocvar_g_nick_flood_penalty_red; -int autocvar_g_nick_flood_penalty_yellow; -//float autocvar_g_nick_flood_timeout; -bool autocvar_g_nodepthtestitems; -bool autocvar_g_nodepthtestplayers; -bool autocvar_g_norecoil; -float autocvar_g_items_mindist; -float autocvar_g_items_maxdist; -int autocvar_g_pickup_items; -float autocvar_g_player_alpha; -float autocvar_g_player_brightness; -float autocvar_g_player_damageforcescale = 2; -bool autocvar_g_playerclip_collisions; -int autocvar_g_powerups; -int autocvar_g_projectiles_damage; -bool autocvar_g_projectiles_keep_owner; -int autocvar_g_projectiles_newton_style; -float autocvar_g_projectiles_newton_style_2_maxfactor; -float autocvar_g_projectiles_newton_style_2_minfactor; -int autocvar_g_projectiles_spread_style; -float autocvar_g_respawn_delay_small; -int autocvar_g_respawn_delay_small_count; -float autocvar_g_respawn_delay_large; -int autocvar_g_respawn_delay_large_count; -float autocvar_g_respawn_delay_max; -bool autocvar_g_respawn_delay_forced; -bool autocvar_g_respawn_ghosts; -float autocvar_g_respawn_ghosts_alpha = 1; -float autocvar_g_respawn_ghosts_fadetime = 1.5; -float autocvar_g_respawn_ghosts_time = 4.5; -float autocvar_g_respawn_ghosts_speed; -int autocvar_g_respawn_waves; -string autocvar_g_shootfromfixedorigin; -int autocvar_g_showweaponspawns; -bool autocvar_g_spawn_alloweffects; -float autocvar_g_spawn_furthest; -bool autocvar_g_spawn_useallspawns; -bool autocvar_g_spawnpoints_auto_move_out_of_solid; -float autocvar_g_spawnshieldtime; -float autocvar_g_spawnshield_blockdamage; -float autocvar_g_teamdamage_resetspeed; -float autocvar_g_teamdamage_threshold; -bool autocvar_g_telefrags; -bool autocvar_g_telefrags_avoid; -bool autocvar_g_telefrags_teamplay; -float autocvar_g_teleport_maxspeed; -bool autocvar_g_throughfloor_debug; -float autocvar_g_throughfloor_damage; -float autocvar_g_throughfloor_force; -float autocvar_g_throughfloor_damage_max_stddev; -float autocvar_g_throughfloor_force_max_stddev; -float autocvar_g_throughfloor_min_steps_player; -float autocvar_g_throughfloor_max_steps_player; -float autocvar_g_throughfloor_min_steps_other; -float autocvar_g_throughfloor_max_steps_other; -float autocvar_g_triggerimpulse_accel_multiplier; -float autocvar_g_triggerimpulse_accel_power; -float autocvar_g_triggerimpulse_directional_multiplier; -float autocvar_g_triggerimpulse_radial_multiplier; -bool autocvar_g_turrets; -float autocvar_g_turrets_aimidle_delay; -bool autocvar_g_turrets_nofire; -bool autocvar_g_turrets_reloadcvars; -float autocvar_g_turrets_targetscan_maxdelay; -float autocvar_g_turrets_targetscan_mindelay; -bool autocvar_g_use_ammunition; -bool autocvar_g_waypointeditor; -bool autocvar_g_waypointeditor_symmetrical; -bool autocvar_g_waypointeditor_symmetrical_allowload = true; -vector autocvar_g_waypointeditor_symmetrical_origin; -int autocvar_g_waypointeditor_symmetrical_order; -vector autocvar_g_waypointeditor_symmetrical_axis; -bool autocvar_g_waypoints_for_items; -#define autocvar_g_weapon_stay cvar("g_weapon_stay") -bool autocvar_g_weapon_throwable; -#define autocvar_g_weaponarena cvar_string("g_weaponarena") -string autocvar_g_xonoticversion; -float autocvar_gameversion; -float autocvar_gameversion_min; -float autocvar_gameversion_max; -string autocvar_hostname; -bool autocvar_lastlevel; -//int autocvar_leadlimit; -int autocvar_leadlimit_and_fraglimit; -int autocvar_leadlimit_override; -int autocvar_minplayers; -int autocvar_minplayers_per_team; -string autocvar_nextmap; -string autocvar_quit_and_redirect; -float autocvar_quit_and_redirect_timer; -bool autocvar_quit_when_empty; -float autocvar_r_showbboxes; -int autocvar_rescan_pending; -bool autocvar_samelevel; -string autocvar_sessionid; -#define autocvar_skill cvar("skill") -#define autocvar_slowmo cvar("slowmo") -float autocvar_snd_soundradius; -int autocvar_spawn_debug; -bool autocvar_speedmeter; -float autocvar_sv_accuracy_data_share = 1; -string autocvar_sv_adminnick; -bool autocvar_sv_autoscreenshot; -int autocvar_sv_cheats; -float autocvar_sv_clientcommand_antispam_time; -int autocvar_sv_clientcommand_antispam_count; -bool autocvar_sv_curl_serverpackages_auto; -bool autocvar_sv_db_saveasdump; -bool autocvar_sv_defaultcharacter; -bool autocvar_sv_defaultcharacterskin; -int autocvar_sv_defaultplayerskin_blue; -int autocvar_sv_defaultplayerskin_pink; -int autocvar_sv_defaultplayerskin_red; -int autocvar_sv_defaultplayerskin_yellow; -string autocvar_sv_defaultplayercolors; -string autocvar_sv_defaultplayermodel; -string autocvar_sv_defaultplayermodel_blue; -string autocvar_sv_defaultplayermodel_pink; -string autocvar_sv_defaultplayermodel_red; -string autocvar_sv_defaultplayermodel_yellow; -int autocvar_sv_defaultplayerskin; -bool autocvar_sv_doors_always_open; -bool autocvar_sv_doublejump; -bool autocvar_sv_eventlog; -bool autocvar_sv_eventlog_console; -bool autocvar_sv_eventlog_files; -int autocvar_sv_eventlog_files_counter; -string autocvar_sv_eventlog_files_nameprefix; -string autocvar_sv_eventlog_files_namesuffix; -bool autocvar_sv_eventlog_files_timestamps; -bool autocvar_sv_eventlog_ipv6_delimiter = false; -float autocvar_sv_friction_on_land; -var float autocvar_sv_friction_slick = 0.5; -float autocvar_sv_gameplayfix_q2airaccelerate = 1; -int autocvar_sv_gentle; -#define autocvar_sv_gravity cvar("sv_gravity") -string autocvar_sv_intermission_cdtrack; -int autocvar_sv_itemstime; -string autocvar_sv_jumpspeedcap_max; -float autocvar_sv_jumpspeedcap_max_disable_on_ramps; -string autocvar_sv_jumpspeedcap_min; -float autocvar_sv_jumpvelocity; -float autocvar_sv_jumpvelocity_crouch; -bool autocvar_sv_logscores_bots; -bool autocvar_sv_logscores_console; -bool autocvar_sv_logscores_file; -string autocvar_sv_logscores_filename; -float autocvar_sv_mapchange_delay; -float autocvar_sv_maxairspeed; -float autocvar_sv_maxspeed; -string autocvar_sv_motd; -int autocvar_sv_name_maxlength = 64; -bool autocvar_sv_precacheplayermodels; -bool autocvar_sv_q3acompat_machineshotgunswap; -bool autocvar_sv_servermodelsonly; -int autocvar_sv_spectate; -float autocvar_sv_spectator_speed_multiplier; -float autocvar_sv_spectator_speed_multiplier_min = 1; -float autocvar_sv_spectator_speed_multiplier_max = 5; -bool autocvar_sv_status_privacy; -float autocvar_sv_stepheight; -float autocvar_sv_strengthsound_antispam_refire_threshold; -float autocvar_sv_strengthsound_antispam_time; -bool autocvar_sv_teamnagger; -bool autocvar_sv_timeout; -float autocvar_sv_timeout_leadtime; -float autocvar_sv_timeout_length; -int autocvar_sv_timeout_number; -float autocvar_sv_timeout_resumetime; -bool autocvar_sv_vote_call; -bool autocvar_sv_vote_change; -string autocvar_sv_vote_commands; -bool autocvar_sv_vote_gametype; -float autocvar_sv_vote_gametype_timeout; -string autocvar_sv_vote_gametype_options; -float autocvar_sv_vote_gametype_keeptwotime; -bool autocvar_sv_vote_gametype_default_current; -int autocvar_sv_vote_limit; -float autocvar_sv_vote_majority_factor; -float autocvar_sv_vote_majority_factor_of_voted; -bool autocvar_sv_vote_master; -bool autocvar_sv_vote_master_callable; -string autocvar_sv_vote_master_commands; -string autocvar_sv_vote_master_password; -int autocvar_sv_vote_master_playerlimit; -bool autocvar_sv_vote_no_stops_vote; -int autocvar_sv_vote_nospectators; -//string autocvar_sv_vote_only_commands; -bool autocvar_sv_vote_override_mostrecent; -bool autocvar_sv_vote_singlecount; -float autocvar_sv_vote_stop; -float autocvar_sv_vote_timeout; -float autocvar_sv_vote_wait; -bool autocvar_sv_vote_gamestart; -string autocvar_sv_weaponstats_file; -float autocvar_sv_gibhealth; -float autocvar_sys_ticrate; -#define autocvar_timelimit cvar("timelimit") -#define autocvar_timelimit_override cvar("timelimit_override") -float autocvar_timelimit_increment; -float autocvar_timelimit_decrement; -float autocvar_timelimit_min; -float autocvar_timelimit_max; -float autocvar_timelimit_overtime; -int autocvar_timelimit_overtimes; -float autocvar_timelimit_suddendeath; -#define autocvar_utf8_enable cvar("utf8_enable") -bool autocvar_sv_gameplayfix_gravityunaffectedbyticrate = true; -bool autocvar_sv_gameplayfix_upwardvelocityclearsongroundflag = true; -float autocvar_g_trueaim_minrange; -float autocvar_g_grab_range; -int autocvar_g_max_info_autoscreenshot; -bool autocvar_physics_ode; -float autocvar_g_monsters; -bool autocvar_g_monsters_edit; -bool autocvar_g_monsters_sounds; -float autocvar_g_monsters_think_delay; -int autocvar_g_monsters_max; -int autocvar_g_monsters_max_perplayer; -float autocvar_g_monsters_damageforcescale = 0.8; -float autocvar_g_monsters_target_range; -bool autocvar_g_monsters_target_infront; -float autocvar_g_monsters_target_infront_range = 0.3; -float autocvar_g_monsters_attack_range; -int autocvar_g_monsters_score_kill; -int autocvar_g_monsters_score_spawned; -bool autocvar_g_monsters_typefrag; -bool autocvar_g_monsters_owners; -float autocvar_g_monsters_miniboss_chance; -float autocvar_g_monsters_miniboss_healthboost; -float autocvar_g_monsters_drop_time; -float autocvar_g_monsters_spawnshieldtime; -bool autocvar_g_monsters_quake_resize = true; -bool autocvar_g_monsters_teams; -float autocvar_g_monsters_respawn_delay; -bool autocvar_g_monsters_respawn; -float autocvar_g_monsters_armor_blockpercent; -float autocvar_g_monsters_healthbars; -bool autocvar_g_monsters_lineofsight = true; -//bool autocvar_g_monsters_ignoretraces = true; -bool autocvar_g_nades; -bool autocvar_g_nades_override_dropweapon = true; -vector autocvar_g_nades_throw_offset; -bool autocvar_g_nades_spawn; -int autocvar_g_nades_spawn_count; -bool autocvar_g_nades_client_select; -bool autocvar_g_nades_pickup = true; -float autocvar_g_nades_pickup_time = 2; -float autocvar_g_nades_nade_lifetime; -float autocvar_g_nades_nade_minforce; -float autocvar_g_nades_nade_maxforce; -float autocvar_g_nades_nade_health; -float autocvar_g_nades_nade_refire; -float autocvar_g_nades_nade_damage; -float autocvar_g_nades_nade_edgedamage; -float autocvar_g_nades_nade_radius; -float autocvar_g_nades_nade_force; -int autocvar_g_nades_nade_newton_style; -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; -float autocvar_g_nades_napalm_ball_lifetime; -float autocvar_g_nades_napalm_ball_radius; -bool autocvar_g_nades_napalm_blast; -float autocvar_g_nades_napalm_fountain_lifetime; -float autocvar_g_nades_napalm_fountain_delay; -float autocvar_g_nades_napalm_fountain_radius; -float autocvar_g_nades_napalm_fountain_damage; -float autocvar_g_nades_napalm_fountain_edgedamage; -float autocvar_g_nades_napalm_burntime; -bool autocvar_g_nades_napalm_selfdamage; -int autocvar_g_nades_nade_type; -int autocvar_g_nades_bonus_type; -bool autocvar_g_nades_bonus; -bool autocvar_g_nades_bonus_onstrength; -bool autocvar_g_nades_bonus_client_select; -bool autocvar_g_nades_bonus_only; -int autocvar_g_nades_bonus_max; -int autocvar_g_nades_bonus_score_max; -int autocvar_g_nades_bonus_score_time; -int autocvar_g_nades_bonus_score_time_flagcarrier; -int autocvar_g_nades_bonus_score_minor; -int autocvar_g_nades_bonus_score_low; -int autocvar_g_nades_bonus_score_high; -int autocvar_g_nades_bonus_score_medium; -int autocvar_g_nades_bonus_score_spree; -float autocvar_g_nades_ice_freeze_time; -float autocvar_g_nades_ice_health; -bool autocvar_g_nades_ice_explode; -bool autocvar_g_nades_ice_teamcheck; -float autocvar_g_nades_heal_time; -float autocvar_g_nades_heal_rate; -float autocvar_g_nades_heal_friend; -float autocvar_g_nades_heal_foe; -float autocvar_g_nades_entrap_strength = 0.01; -float autocvar_g_nades_entrap_speed = 0.5; -float autocvar_g_nades_entrap_radius = 500; -float autocvar_g_nades_entrap_time = 10; -float autocvar_g_nades_veil_time = 8; -float autocvar_g_nades_veil_radius = 300; -string autocvar_g_nades_pokenade_monster_type; -float autocvar_g_nades_pokenade_monster_lifetime; -bool autocvar_g_jump_grunt; -bool autocvar_g_physics_clientselect; -string autocvar_g_physics_clientselect_options; -string autocvar_g_physics_clientselect_default; -bool autocvar_sv_minigames; -bool autocvar_sv_minigames_observer; -float autocvar_sv_player_scale; -float autocvar_g_rm; -float autocvar_g_rm_damage; -float autocvar_g_rm_edgedamage; -float autocvar_g_rm_force; -float autocvar_g_rm_radius; -float autocvar_g_rm_laser; -float autocvar_g_rm_laser_count; -float autocvar_g_rm_laser_speed; -float autocvar_g_rm_laser_spread; -float autocvar_g_rm_laser_spread_random; -float autocvar_g_rm_laser_lifetime; -float autocvar_g_rm_laser_damage; -float autocvar_g_rm_laser_refire; -float autocvar_g_rm_laser_rapid; -float autocvar_g_rm_laser_rapid_refire; -float autocvar_g_rm_laser_rapid_delay; -float autocvar_g_rm_laser_radius; -float autocvar_g_rm_laser_force; -float autocvar_g_frozen_revive_falldamage; -int autocvar_g_frozen_revive_falldamage_health; -bool autocvar_g_frozen_damage_trigger; -float autocvar_g_frozen_force; -float autocvar_sv_airaccel_qw; -float autocvar_sv_airstrafeaccel_qw; -float autocvar_sv_airspeedlimit_nonqw; -float autocvar_sv_airaccel_qw_stretchfactor; -float autocvar_sv_maxairstrafespeed; -float autocvar_sv_airstrafeaccelerate; -float autocvar_sv_warsowbunny_turnaccel; -float autocvar_sv_airaccel_sideways_friction; -float autocvar_sv_aircontrol; -float autocvar_sv_aircontrol_power; -float autocvar_sv_aircontrol_backwards; -float autocvar_sv_aircontrol_sidewards; -float autocvar_sv_aircontrol_penalty; -float autocvar_sv_warsowbunny_airforwardaccel; -float autocvar_sv_warsowbunny_topspeed; -float autocvar_sv_warsowbunny_accel; -float autocvar_sv_warsowbunny_backtosideratio; -float autocvar_sv_friction; -float autocvar_sv_accelerate; -float autocvar_sv_stopspeed; -float autocvar_sv_airaccelerate; -float autocvar_sv_airstopaccelerate; -float autocvar_sv_track_canjump; -bool autocvar_sv_showspectators; -bool autocvar_g_weaponswitch_debug; -bool autocvar_g_weaponswitch_debug_alternate; -bool autocvar_g_allow_checkpoints; -bool autocvar_sv_q3defragcompat_changehitbox = false; -int autocvar_sv_clones; -bool autocvar_g_footsteps; -float autocvar_sv_maxidle; -bool autocvar_sv_maxidle_spectatorsareidle; -int autocvar_sv_maxidle_slots; -bool autocvar_sv_maxidle_slots_countbots; -bool autocvar_sv_autotaunt; -bool autocvar_g_warmup_allguns; -bool autocvar_g_warmup_allow_timeout; -float autocvar_g_weaponspreadfactor; -float autocvar_g_weaponforcefactor; -float autocvar_g_weapondamagefactor; -float autocvar_g_weaponratefactor; -float autocvar_g_weaponspeedfactor; -float autocvar_sv_foginterval; -bool autocvar_sv_ready_restart_repeatable; -bool autocvar_g_jetpack; -bool autocvar_sv_taunt; -bool autocvar_sv_ready_restart; diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh index 5ee3963cb..44ed3b8db 100644 --- a/qcsrc/server/bot/api.qh +++ b/qcsrc/server/bot/api.qh @@ -5,6 +5,7 @@ #include #include +bool autocvar_g_waypoints_for_items; bool bot_waypoints_for_items; const int WAYPOINTFLAG_GENERATED = BIT(23); diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index f6e991770..7afa5a10c 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/bot/default/cvars.qh b/qcsrc/server/bot/default/cvars.qh index 269cd6804..4b3888986 100644 --- a/qcsrc/server/bot/default/cvars.qh +++ b/qcsrc/server/bot/default/cvars.qh @@ -61,5 +61,12 @@ bool autocvar_bot_wander_enable; bool autocvar_bot_typefrag; bool autocvar_g_debug_bot_commands; int autocvar_g_waypointeditor_auto; +#define autocvar_skill cvar("skill") float autocvar_skill_auto; bool autocvar_waypoint_benchmark; +int autocvar_bot_number; +float autocvar_bot_ai_strategyinterval; +float autocvar_bot_ai_strategyinterval_movingtarget; +int autocvar_bot_vs_human; +int autocvar_minplayers; +int autocvar_minplayers_per_team; diff --git a/qcsrc/server/bot/default/waypoints.qh b/qcsrc/server/bot/default/waypoints.qh index e9aa1ee12..bcaa80dbc 100644 --- a/qcsrc/server/bot/default/waypoints.qh +++ b/qcsrc/server/bot/default/waypoints.qh @@ -1,7 +1,11 @@ #pragma once -/* - * Globals and Fields - */ + +bool autocvar_g_waypointeditor; +bool autocvar_g_waypointeditor_symmetrical; +bool autocvar_g_waypointeditor_symmetrical_allowload = true; +vector autocvar_g_waypointeditor_symmetrical_origin; +int autocvar_g_waypointeditor_symmetrical_order; +vector autocvar_g_waypointeditor_symmetrical_axis; // increase by 0.01 when changes require only waypoint relinking // increase by 1 when changes require to manually edit waypoints diff --git a/qcsrc/server/campaign.qh b/qcsrc/server/campaign.qh index 0662a3704..1aca24492 100644 --- a/qcsrc/server/campaign.qh +++ b/qcsrc/server/campaign.qh @@ -1,5 +1,12 @@ #pragma once +bool autocvar__campaign_testrun; +int autocvar__campaign_index; +string autocvar__campaign_name; +bool autocvar_g_campaign; +float autocvar_g_campaign_forceteam; +int autocvar_g_campaign_skill; + // this must be included BEFORE campaign_common.h to make this a memory saving #define CAMPAIGN_MAX_ENTRIES 2 diff --git a/qcsrc/server/chat.qh b/qcsrc/server/chat.qh index 9c30e89a4..500d757c0 100644 --- a/qcsrc/server/chat.qh +++ b/qcsrc/server/chat.qh @@ -1,5 +1,19 @@ #pragma once +float autocvar_g_chat_flood_burst; +float autocvar_g_chat_flood_burst_team; +float autocvar_g_chat_flood_burst_tell; +float autocvar_g_chat_flood_lmax; +float autocvar_g_chat_flood_lmax_team; +float autocvar_g_chat_flood_lmax_tell; +bool autocvar_g_chat_flood_notify_flooder; +float autocvar_g_chat_flood_spl; +float autocvar_g_chat_flood_spl_team; +float autocvar_g_chat_flood_spl_tell; +int autocvar_g_chat_nospectators; +bool autocvar_g_chat_teamcolors; +bool autocvar_g_chat_tellprivacy; + const float NUM_NEAREST_ENTITIES = 4; entity nearest_entity[NUM_NEAREST_ENTITIES]; float nearest_length[NUM_NEAREST_ENTITIES]; diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh index 4a730d77f..9ab0fade7 100644 --- a/qcsrc/server/cheats.qh +++ b/qcsrc/server/cheats.qh @@ -2,7 +2,10 @@ #include -//float autocvar_sv_cheats; // must... declare... global +int autocvar_sv_cheats; +float autocvar_g_grab_range; +int autocvar_g_max_info_autoscreenshot; +int autocvar_sv_clones; float cheatcount_total; .float cheatcount; diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index d5868c1f4..8dd73f66c 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -71,6 +73,7 @@ #include #include #include +#include #include #include diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index abda1204a..563fdba1b 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -5,6 +5,54 @@ #include #include +bool autocvar__notarget; +int autocvar_g_balance_armor_start; +float autocvar_g_balance_pause_armor_rot_spawn; +float autocvar_g_balance_pause_fuel_rot_spawn; +float autocvar_g_balance_pause_health_regen_spawn; +float autocvar_g_balance_pause_health_rot_spawn; +bool autocvar_g_botclip_collisions; +bool autocvar_g_fullbrightplayers; +bool autocvar_g_playerclip_collisions; +float autocvar_g_player_alpha; +float autocvar_g_player_brightness; +float autocvar_g_player_damageforcescale = 2; +float autocvar_g_respawn_delay_small; +int autocvar_g_respawn_delay_small_count; +float autocvar_g_respawn_delay_large; +int autocvar_g_respawn_delay_large_count; +float autocvar_g_respawn_delay_max; +bool autocvar_g_respawn_delay_forced; +bool autocvar_g_respawn_ghosts; +float autocvar_g_respawn_ghosts_alpha = 1; +float autocvar_g_respawn_ghosts_fadetime = 1.5; +float autocvar_g_respawn_ghosts_time = 4.5; +float autocvar_g_respawn_ghosts_speed; +int autocvar_g_respawn_waves; +bool autocvar_g_nodepthtestplayers; +string autocvar_g_mutatormsg; +float autocvar_sv_foginterval; +float autocvar_sv_maxidle; +bool autocvar_sv_maxidle_spectatorsareidle; +int autocvar_sv_maxidle_slots; +bool autocvar_sv_maxidle_slots_countbots; +bool autocvar_g_forced_respawn; +int autocvar_g_maxplayers; +float autocvar_g_maxplayers_spectator_blocktime; +string autocvar_g_xonoticversion; +float autocvar_gameversion; +float autocvar_gameversion_min; +float autocvar_gameversion_max; +string autocvar_hostname; +int autocvar_spawn_debug; +string autocvar_sv_motd; +int autocvar_sv_name_maxlength = 64; +bool autocvar_sv_servermodelsonly; +int autocvar_sv_spectate; +bool autocvar_sv_teamnagger; +float autocvar_sv_player_scale; +bool autocvar_sv_showspectators; + // WEAPONTODO .string weaponorder_byimpulse; diff --git a/qcsrc/server/clientkill.qh b/qcsrc/server/clientkill.qh index 5b26adf91..40e33b500 100644 --- a/qcsrc/server/clientkill.qh +++ b/qcsrc/server/clientkill.qh @@ -1,3 +1,7 @@ +#pragma once + +float autocvar_g_balance_kill_delay; +float autocvar_g_balance_kill_antispam; // set when showing a kill countdown .entity killindicator; diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh index ae16532ec..80eb85b56 100644 --- a/qcsrc/server/command/banning.qh +++ b/qcsrc/server/command/banning.qh @@ -1,9 +1,15 @@ #pragma once -// ==================================== -// Declarations for kick/ban commands -// Last updated: December 29th, 2011 -// ===================================== +float autocvar_g_ban_default_bantime; +float autocvar_g_ban_default_masksize; +float autocvar_g_ban_sync_interval; +float autocvar_g_ban_sync_timeout; +string autocvar_g_ban_sync_trusted_servers; +bool autocvar_g_ban_sync_trusted_servers_verify; +string autocvar_g_ban_sync_uri; +bool autocvar_g_ban_telluser = true; +string autocvar_g_banned_list; +bool autocvar_g_banned_list_idmode; #define GET_BAN_ARG(v, d) if (argc > reason_arg) { if ((v = stof(argv(reason_arg))) != 0) ++reason_arg; else v = d; } else { v = d; } #define GET_BAN_REASON(v, d) if (argc > reason_arg) v = substring(command, argv_start_index(reason_arg), strlen(command) - argv_start_index(reason_arg)); else v = d; diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 106da7720..ad3685a1f 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh index 3f8e4c47a..f2f721571 100644 --- a/qcsrc/server/command/cmd.qh +++ b/qcsrc/server/command/cmd.qh @@ -1,5 +1,10 @@ #pragma once +float autocvar_sv_clientcommand_antispam_time; +int autocvar_sv_clientcommand_antispam_count; +bool autocvar_sv_ready_restart; +bool autocvar_sv_ready_restart_repeatable; + .float cmd_floodtime; .float cmd_floodcount; diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index e4299039e..5dff9f5f5 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index c9aad4b79..3949b92ce 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -1,5 +1,13 @@ #pragma once +string autocvar_sv_adminnick; +bool autocvar_sv_status_privacy; +bool autocvar_sv_timeout; +float autocvar_sv_timeout_leadtime; +float autocvar_sv_timeout_length; +int autocvar_sv_timeout_number; +float autocvar_sv_timeout_resumetime; + #include REGISTRY(COMMON_COMMANDS, BITS(7)) REGISTER_REGISTRY(COMMON_COMMANDS) diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 81121cfe8..d0f882dce 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 67f683cdf..e3347980d 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index 7085ca0e1..4dfd9e857 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -1,9 +1,25 @@ #pragma once -// ================================================ -// Declarations for the vote system/vote commands -// Last updated: December 14th, 2011 -// ================================================ +bool autocvar_sv_vote_call; +bool autocvar_sv_vote_change; +string autocvar_sv_vote_commands; +int autocvar_sv_vote_limit; +float autocvar_sv_vote_majority_factor; +float autocvar_sv_vote_majority_factor_of_voted; +bool autocvar_sv_vote_master; +bool autocvar_sv_vote_master_callable; +string autocvar_sv_vote_master_commands; +string autocvar_sv_vote_master_password; +int autocvar_sv_vote_master_playerlimit; +bool autocvar_sv_vote_no_stops_vote; +int autocvar_sv_vote_nospectators; +//string autocvar_sv_vote_only_commands; +bool autocvar_sv_vote_override_mostrecent; +bool autocvar_sv_vote_singlecount; +float autocvar_sv_vote_stop; +float autocvar_sv_vote_timeout; +float autocvar_sv_vote_wait; +bool autocvar_sv_vote_gamestart; // definitions for command selection between progs const float VC_ASGNMNT_BOTH = 1; diff --git a/qcsrc/server/compat/quake3.qh b/qcsrc/server/compat/quake3.qh index 20e4879d9..a9b90abad 100644 --- a/qcsrc/server/compat/quake3.qh +++ b/qcsrc/server/compat/quake3.qh @@ -1,5 +1,8 @@ #pragma once +bool autocvar_sv_q3acompat_machineshotgunswap; +bool autocvar_sv_q3defragcompat_changehitbox = false; + bool DoesQ3ARemoveThisEntity(entity this); .int fragsfilter_cnt; diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc index fd2e9f2a6..942f7e8de 100644 --- a/qcsrc/server/damage.qc +++ b/qcsrc/server/damage.qc @@ -36,6 +36,7 @@ #include #include #include +#include #include void UpdateFrags(entity player, int f) diff --git a/qcsrc/server/damage.qh b/qcsrc/server/damage.qh index 68ea7a873..7284f8c19 100644 --- a/qcsrc/server/damage.qh +++ b/qcsrc/server/damage.qh @@ -2,6 +2,34 @@ #include +bool autocvar_g_throughfloor_debug; +float autocvar_g_throughfloor_damage; +float autocvar_g_throughfloor_force; +float autocvar_g_throughfloor_damage_max_stddev; +float autocvar_g_throughfloor_force_max_stddev; +float autocvar_g_throughfloor_min_steps_player; +float autocvar_g_throughfloor_max_steps_player; +float autocvar_g_throughfloor_min_steps_other; +float autocvar_g_throughfloor_max_steps_other; +float autocvar_g_mirrordamage; +bool autocvar_g_mirrordamage_virtual; +bool autocvar_g_mirrordamage_onlyweapons; +float autocvar_g_maxpushtime; +float autocvar_g_balance_damagepush_speedfactor; +int autocvar_g_balance_firetransfer_damage; +int autocvar_g_balance_firetransfer_time; +float autocvar_g_balance_armor_blockpercent; +float autocvar_g_teamdamage_resetspeed; +float autocvar_g_teamdamage_threshold; +float autocvar_g_balance_selfdamagepercent; +float autocvar_g_friendlyfire; +float autocvar_g_friendlyfire_virtual; +float autocvar_g_friendlyfire_virtual_force; +float autocvar_g_frozen_revive_falldamage; +int autocvar_g_frozen_revive_falldamage_health; +bool autocvar_g_frozen_damage_trigger; +float autocvar_g_frozen_force; + .void(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) event_damage; .bool(entity targ, entity inflictor, float amount, float limit) event_heal; diff --git a/qcsrc/server/gamelog.qc b/qcsrc/server/gamelog.qc index a3e747cab..f89cf18a0 100644 --- a/qcsrc/server/gamelog.qc +++ b/qcsrc/server/gamelog.qc @@ -1,6 +1,5 @@ #include "gamelog.qh" -#include #include string GameLog_ProcessIP(string s) diff --git a/qcsrc/server/gamelog.qh b/qcsrc/server/gamelog.qh index 2fac52e47..f96679b81 100644 --- a/qcsrc/server/gamelog.qh +++ b/qcsrc/server/gamelog.qh @@ -1,5 +1,14 @@ #pragma once +bool autocvar_sv_eventlog; +bool autocvar_sv_eventlog_console; +bool autocvar_sv_eventlog_files; +int autocvar_sv_eventlog_files_counter; +string autocvar_sv_eventlog_files_nameprefix; +string autocvar_sv_eventlog_files_namesuffix; +bool autocvar_sv_eventlog_files_timestamps; +bool autocvar_sv_eventlog_ipv6_delimiter = false; + bool logfile_open; float logfile; diff --git a/qcsrc/server/hook.qh b/qcsrc/server/hook.qh index 23ec8cf7f..1b0729bd0 100644 --- a/qcsrc/server/hook.qh +++ b/qcsrc/server/hook.qh @@ -1,5 +1,20 @@ #pragma once +float autocvar_g_balance_grapplehook_airfriction; +float autocvar_g_balance_grapplehook_force_rubber; +float autocvar_g_balance_grapplehook_force_rubber_overstretch; +float autocvar_g_balance_grapplehook_health; +float autocvar_g_balance_grapplehook_length_min; +float autocvar_g_balance_grapplehook_speed_fly; +float autocvar_g_balance_grapplehook_speed_pull; +float autocvar_g_balance_grapplehook_stretch; +float autocvar_g_balance_grapplehook_damagedbycontents; +float autocvar_g_balance_grapplehook_refire; +int autocvar_g_balance_grapplehook_pull_frozen; +float autocvar_g_balance_grapplehook_nade_time; +bool autocvar_g_balance_grapplehook_gravity; +bool autocvar_g_balance_grapplehook_crouchslide; + // Wazat's grappling hook .entity hook; void GrapplingHookThink(entity this); diff --git a/qcsrc/server/intermission.qc b/qcsrc/server/intermission.qc index fe2e0dea0..001692cf9 100644 --- a/qcsrc/server/intermission.qc +++ b/qcsrc/server/intermission.qc @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/intermission.qh b/qcsrc/server/intermission.qh index 03458eb79..b0d788ddc 100644 --- a/qcsrc/server/intermission.qh +++ b/qcsrc/server/intermission.qh @@ -1,5 +1,11 @@ #pragma once +bool autocvar_lastlevel; +string autocvar_nextmap; +bool autocvar_samelevel; +bool autocvar_sv_autoscreenshot; +string autocvar_sv_intermission_cdtrack; + float intermission_running; float intermission_exittime; float alreadychangedlevel; diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc index d8e055daf..b9ad08873 100644 --- a/qcsrc/server/ipban.qc +++ b/qcsrc/server/ipban.qc @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh index 49fea39d0..7fc9f0fa3 100644 --- a/qcsrc/server/items/items.qh +++ b/qcsrc/server/items/items.qh @@ -2,6 +2,15 @@ #include +float autocvar_g_balance_superweapons_time; +bool autocvar_g_fullbrightitems; +int autocvar_g_powerups; +float autocvar_g_items_mindist; +float autocvar_g_items_maxdist; +int autocvar_g_pickup_items; +bool autocvar_g_nodepthtestitems; +#define autocvar_g_weapon_stay cvar("g_weapon_stay") + void StartItem(entity this, entity a); .int item_group; .int item_group_count; diff --git a/qcsrc/server/main.qh b/qcsrc/server/main.qh index 2fde70481..0685ca71f 100644 --- a/qcsrc/server/main.qh +++ b/qcsrc/server/main.qh @@ -1,5 +1,21 @@ #pragma once +float autocvar_g_balance_contents_damagerate; +float autocvar_g_balance_contents_drowndelay; +int autocvar_g_balance_contents_playerdamage_drowning; +int autocvar_g_balance_contents_playerdamage_lava; +int autocvar_g_balance_contents_playerdamage_lava_burn; // 10 is a nice value +float autocvar_g_balance_contents_playerdamage_lava_burn_time = 2.5; // note: damage is total across this time (not by dps) +int autocvar_g_balance_contents_playerdamage_slime; +int autocvar_g_balance_contents_projectiledamage; +float autocvar_g_balance_falldamage_deadminspeed; +float autocvar_g_balance_falldamage_factor; +int autocvar_g_balance_falldamage_maxdamage; +float autocvar_g_balance_falldamage_minspeed; +bool autocvar_g_balance_falldamage_onlyvertical; +#define autocvar_slowmo cvar("slowmo") +float autocvar_sys_ticrate; + /** print(), but only print if the server is not local */ void dedicated_print(string input); diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh index 31d89f42c..7bc8a84ea 100644 --- a/qcsrc/server/mapvoting.qh +++ b/qcsrc/server/mapvoting.qh @@ -1,5 +1,30 @@ #pragma once +#define autocvar_g_maplist cvar_string("g_maplist") +bool autocvar_g_maplist_check_waypoints; +int autocvar_g_maplist_index; +string autocvar_g_maplist_mostrecent; +int autocvar_g_maplist_mostrecent_count; +bool autocvar_g_maplist_selectrandom; +float autocvar_g_maplist_shuffle; +#define autocvar_g_maplist_votable cvar("g_maplist_votable") +bool autocvar_g_maplist_votable_abstain; +float autocvar_g_maplist_votable_keeptwotime; +bool autocvar_g_maplist_votable_nodetail; +string autocvar_g_maplist_votable_screenshot_dir; +bool autocvar_g_maplist_votable_suggestions; +bool autocvar_g_maplist_votable_suggestions_override_mostrecent; +float autocvar_g_maplist_votable_timeout; +bool autocvar_g_maplist_ignore_sizes; +bool autocvar_g_maplist_sizes_count_maxplayers = true; +bool autocvar_g_maplist_sizes_count_bots = true; +int autocvar_rescan_pending; +bool autocvar_sv_vote_gametype; +float autocvar_sv_vote_gametype_timeout; +string autocvar_sv_vote_gametype_options; +float autocvar_sv_vote_gametype_keeptwotime; +bool autocvar_sv_vote_gametype_default_current; + // definitions for functions used outside mapvoting.qc void MapVote_Start(); void MapVote_Spawn(); diff --git a/qcsrc/server/player.qh b/qcsrc/server/player.qh index 523a573a9..c22ea8646 100644 --- a/qcsrc/server/player.qh +++ b/qcsrc/server/player.qh @@ -1,5 +1,23 @@ #pragma once +float autocvar_g_spawnshieldtime; +float autocvar_g_spawnshield_blockdamage; +bool autocvar_sv_precacheplayermodels; +bool autocvar_sv_defaultcharacter; +bool autocvar_sv_defaultcharacterskin; +int autocvar_sv_defaultplayerskin_blue; +int autocvar_sv_defaultplayerskin_pink; +int autocvar_sv_defaultplayerskin_red; +int autocvar_sv_defaultplayerskin_yellow; +string autocvar_sv_defaultplayercolors; +string autocvar_sv_defaultplayermodel; +string autocvar_sv_defaultplayermodel_blue; +string autocvar_sv_defaultplayermodel_pink; +string autocvar_sv_defaultplayermodel_red; +string autocvar_sv_defaultplayermodel_yellow; +int autocvar_sv_defaultplayerskin; +float autocvar_sv_gibhealth; + .entity pusher; .float pushltime; .bool istypefrag; diff --git a/qcsrc/server/portals.qh b/qcsrc/server/portals.qh index 20a2bd930..bdd15f049 100644 --- a/qcsrc/server/portals.qh +++ b/qcsrc/server/portals.qh @@ -1,5 +1,8 @@ #pragma once +float autocvar_g_balance_portal_health; +float autocvar_g_balance_portal_lifetime; + .float portal_id; .entity portal_in, portal_out; diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh index 9dd37a89e..0bef0b59a 100644 --- a/qcsrc/server/race.qh +++ b/qcsrc/server/race.qh @@ -1,5 +1,7 @@ #pragma once +bool autocvar_g_allow_checkpoints; + .string stored_netname; // TODO: store this information independently of race-based gamemodes float race_teams; diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc index cc301130e..e0b8995f1 100644 --- a/qcsrc/server/resources.qc +++ b/qcsrc/server/resources.qc @@ -5,7 +5,6 @@ /// \author Lyberta /// \copyright GNU GPLv2 or any later version. -#include #include #include diff --git a/qcsrc/server/resources.qh b/qcsrc/server/resources.qh index c228b6ec4..05cb602c3 100644 --- a/qcsrc/server/resources.qh +++ b/qcsrc/server/resources.qh @@ -7,6 +7,34 @@ #include +// TODO: split resources into their own files, registry based +float autocvar_g_balance_health_limit; +int autocvar_g_balance_armor_limit; +float autocvar_g_balance_fuel_limit; +float autocvar_g_balance_armor_regen; +float autocvar_g_balance_armor_regenlinear; +int autocvar_g_balance_armor_regenstable; +float autocvar_g_balance_armor_rot; +float autocvar_g_balance_armor_rotlinear; +int autocvar_g_balance_armor_rotstable; +float autocvar_g_balance_fuel_regen; +float autocvar_g_balance_fuel_regenlinear; +int autocvar_g_balance_fuel_regenstable; +float autocvar_g_balance_fuel_rot; +float autocvar_g_balance_fuel_rotlinear; +int autocvar_g_balance_fuel_rotstable; +float autocvar_g_balance_health_regen; +float autocvar_g_balance_health_regenlinear; +float autocvar_g_balance_health_regenstable; +float autocvar_g_balance_health_rot; +float autocvar_g_balance_health_rotlinear; +float autocvar_g_balance_health_rotstable; +float autocvar_g_balance_pause_armor_rot; +float autocvar_g_balance_pause_fuel_regen; +float autocvar_g_balance_pause_fuel_rot; +float autocvar_g_balance_pause_health_regen; +float autocvar_g_balance_pause_health_rot; + // ============================ Public API ==================================== /// \brief Returns the maximum amount of the given resource. diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh index cae0169aa..2287815f5 100644 --- a/qcsrc/server/scores.qh +++ b/qcsrc/server/scores.qh @@ -2,6 +2,8 @@ #include +bool autocvar_g_full_getstatus_responses; + entity scores_initialized; // non-NULL when scores labels/rules have been set .float scoreboard_pos; diff --git a/qcsrc/server/spawnpoints.qh b/qcsrc/server/spawnpoints.qh index 39b5492c5..d9707a167 100644 --- a/qcsrc/server/spawnpoints.qh +++ b/qcsrc/server/spawnpoints.qh @@ -1,5 +1,11 @@ #pragma once +bool autocvar_g_spawn_alloweffects; +float autocvar_g_spawn_furthest; +bool autocvar_g_spawn_useallspawns; +bool autocvar_g_spawnpoints_auto_move_out_of_solid; +float autocvar_r_showbboxes; // engine cvar + // spawnpoint prios const int SPAWN_PRIO_NEAR_TEAMMATE_FOUND = 200; const int SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM = 100; diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 2e293bac8..43d4d2461 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh index 33f9d02d7..1b1562976 100644 --- a/qcsrc/server/teamplay.qh +++ b/qcsrc/server/teamplay.qh @@ -8,6 +8,8 @@ bool autocvar_teamplay_lockonrestart; bool autocvar_g_balance_teams; bool autocvar_g_balance_teams_prevent_imbalance; +string autocvar_g_forced_team_otherwise; + bool lockteams; // ========================== Global teams API ================================ diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh index 2dbcee7ad..cf941aa54 100644 --- a/qcsrc/server/tests.qh +++ b/qcsrc/server/tests.qh @@ -5,8 +5,8 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh index 396de1bdb..6005813fe 100644 --- a/qcsrc/server/weapons/accuracy.qh +++ b/qcsrc/server/weapons/accuracy.qh @@ -3,6 +3,8 @@ #include #include +float autocvar_sv_accuracy_data_share = 1; + .bool cvar_cl_accuracy_data_share; REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share"); .bool cvar_cl_accuracy_data_receive; diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh index 77f707d0a..1bf9261f7 100644 --- a/qcsrc/server/weapons/common.qh +++ b/qcsrc/server/weapons/common.qh @@ -1,5 +1,10 @@ #pragma once +int autocvar_g_projectiles_damage; +bool autocvar_g_projectiles_keep_owner; +float autocvar_sv_strengthsound_antispam_refire_threshold; +float autocvar_sv_strengthsound_antispam_time; + bool W_DualWielding(entity player); void W_GiveWeapon (entity e, float wep); .float prevstrengthsound; diff --git a/qcsrc/server/weapons/hitplot.qh b/qcsrc/server/weapons/hitplot.qh index e96867835..90bdc561e 100644 --- a/qcsrc/server/weapons/hitplot.qh +++ b/qcsrc/server/weapons/hitplot.qh @@ -1,5 +1,8 @@ #pragma once +bool autocvar_g_hitplots; +string autocvar_g_hitplots_individuals; + .float hitplotfh; void W_HitPlotAnalysis(entity player, entity wep, vector screenforward, vector screenright, vector screenup); diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh index 01c05d3fb..363b569ef 100644 --- a/qcsrc/server/weapons/selection.qh +++ b/qcsrc/server/weapons/selection.qh @@ -3,6 +3,10 @@ #include #include +int autocvar_g_showweaponspawns; +bool autocvar_g_weaponswitch_debug; +bool autocvar_g_weaponswitch_debug_alternate; + .int selectweapon; // last selected weapon of the player .WepSet dual_weapons; diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh index 22adc649b..b3c7df645 100644 --- a/qcsrc/server/weapons/throwing.qh +++ b/qcsrc/server/weapons/throwing.qh @@ -3,6 +3,8 @@ #include #include +bool autocvar_g_weapon_throwable; + .float savenextthink; void thrown_wep_think(entity this); diff --git a/qcsrc/server/weapons/tracing.qh b/qcsrc/server/weapons/tracing.qh index 9c5a77c8d..94b3be212 100644 --- a/qcsrc/server/weapons/tracing.qh +++ b/qcsrc/server/weapons/tracing.qh @@ -3,6 +3,18 @@ #include #include +float autocvar_g_ballistics_density_corpse; +float autocvar_g_ballistics_density_player; +float autocvar_g_ballistics_mindistance; +bool autocvar_g_ballistics_penetrate_clips = true; +float autocvar_g_ballistics_solidpenetration_exponent = 1; +int autocvar_g_projectiles_newton_style; +float autocvar_g_projectiles_newton_style_2_maxfactor; +float autocvar_g_projectiles_newton_style_2_minfactor; +int autocvar_g_projectiles_spread_style; +bool autocvar_g_norecoil; +float autocvar_g_trueaim_minrange; + vector w_shotorg; vector w_shotdir; vector w_shotend; diff --git a/qcsrc/server/weapons/weaponstats.qh b/qcsrc/server/weapons/weaponstats.qh index f031223e7..b67399ee7 100644 --- a/qcsrc/server/weapons/weaponstats.qh +++ b/qcsrc/server/weapons/weaponstats.qh @@ -1,5 +1,7 @@ #pragma once +string autocvar_sv_weaponstats_file; + float weaponstats_buffer; void WeaponStats_Init(); diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh index 284c1efc6..5291f98dd 100644 --- a/qcsrc/server/weapons/weaponsystem.qh +++ b/qcsrc/server/weapons/weaponsystem.qh @@ -2,6 +2,12 @@ #include +float autocvar_g_weaponspreadfactor; +float autocvar_g_weaponforcefactor; +float autocvar_g_weapondamagefactor; +float autocvar_g_weaponratefactor; +float autocvar_g_weaponspeedfactor; + #define INDEPENDENT_ATTACK_FINISHED 1 // there is 2 weapon tics that can run in one server frame diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index 0aed2e507..5531d223f 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh index 7448c0847..4141c99e2 100644 --- a/qcsrc/server/world.qh +++ b/qcsrc/server/world.qh @@ -2,6 +2,31 @@ #include +bool autocvar__sv_init; +bool autocvar_g_use_ammunition; +bool autocvar_g_jetpack; +bool autocvar_g_warmup_allguns; +bool autocvar_g_warmup_allow_timeout; +#define autocvar_g_weaponarena cvar_string("g_weaponarena") +string autocvar_quit_and_redirect; +float autocvar_quit_and_redirect_timer; +bool autocvar_quit_when_empty; +string autocvar_sessionid; +bool autocvar_sv_curl_serverpackages_auto; +bool autocvar_sv_db_saveasdump; +bool autocvar_sv_logscores_bots; +bool autocvar_sv_logscores_console; +bool autocvar_sv_logscores_file; +string autocvar_sv_logscores_filename; +float autocvar_sv_mapchange_delay; +float autocvar_timelimit_increment; +float autocvar_timelimit_decrement; +float autocvar_timelimit_min; +float autocvar_timelimit_max; +float autocvar_timelimit_overtime; +int autocvar_timelimit_overtimes; +float autocvar_timelimit_suddendeath; + float checkrules_equality; float checkrules_suddendeathwarning; float checkrules_suddendeathend; -- 2.39.2