From 6c1a57370ea4cc55c76508a3841248846caebb7c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 15 Oct 2015 01:01:25 +1000 Subject: [PATCH] Move some more cvars and kill a keyhunt specific call --- .../gamemodes/gamemode/nexball/nexball.qc | 9 ++++++++ qcsrc/server/autocvars.qh | 23 ------------------- qcsrc/server/command/vote.qc | 3 --- qcsrc/server/mutators/gamemode_keyhunt.qc | 23 +++++++++++++++++++ 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 959ec857d..7520fcdbb 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@ -27,6 +27,15 @@ float autocvar_g_nexball_viewmodel_scale; float autocvar_g_nexball_tackling; vector autocvar_g_nexball_viewmodel_offset; +float autocvar_g_balance_nexball_primary_animtime; +float autocvar_g_balance_nexball_primary_refire; +float autocvar_g_balance_nexball_primary_speed; +float autocvar_g_balance_nexball_secondary_animtime; +float autocvar_g_balance_nexball_secondary_force; +float autocvar_g_balance_nexball_secondary_lifetime; +float autocvar_g_balance_nexball_secondary_refire; +float autocvar_g_balance_nexball_secondary_speed; + void basketball_touch(); void football_touch(); void ResetBall(); diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 2904d5c22..912bd49de 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -120,31 +120,8 @@ 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_keyhunt_damageforcescale; -float autocvar_g_balance_keyhunt_delay_collect; -float autocvar_g_balance_keyhunt_delay_return; -float autocvar_g_balance_keyhunt_delay_round; -float autocvar_g_balance_keyhunt_delay_tracking; -float autocvar_g_balance_keyhunt_dropvelocity; -float autocvar_g_balance_keyhunt_maxdist; -float autocvar_g_balance_keyhunt_protecttime; -int autocvar_g_balance_keyhunt_score_capture; -int autocvar_g_balance_keyhunt_score_carrierfrag; -int autocvar_g_balance_keyhunt_score_collect; -int autocvar_g_balance_keyhunt_score_destroyed; -int autocvar_g_balance_keyhunt_score_destroyed_ownfactor; -int autocvar_g_balance_keyhunt_score_push; -float autocvar_g_balance_keyhunt_throwvelocity; float autocvar_g_balance_kill_delay; float autocvar_g_balance_kill_antispam; -float autocvar_g_balance_nexball_primary_animtime; -float autocvar_g_balance_nexball_primary_refire; -float autocvar_g_balance_nexball_primary_speed; -float autocvar_g_balance_nexball_secondary_animtime; -float autocvar_g_balance_nexball_secondary_force; -float autocvar_g_balance_nexball_secondary_lifetime; -float autocvar_g_balance_nexball_secondary_refire; -float autocvar_g_balance_nexball_secondary_speed; int autocvar_g_balance_nix_ammo_cells; int autocvar_g_balance_nix_ammo_plasma; int autocvar_g_balance_nix_ammo_fuel; diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 60faeb3c2..5da2feb2f 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -422,9 +422,6 @@ void reset_map(float dorespawn) } } - if(g_keyhunt) - kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round + (game_starttime - time), kh_StartRound); - setself(this); } diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc index 4893bf13e..9b33d5d75 100644 --- a/qcsrc/server/mutators/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/gamemode_keyhunt.qc @@ -2,6 +2,23 @@ #include "gamemode.qh" +float autocvar_g_balance_keyhunt_damageforcescale; +float autocvar_g_balance_keyhunt_delay_collect; +float autocvar_g_balance_keyhunt_delay_return; +float autocvar_g_balance_keyhunt_delay_round; +float autocvar_g_balance_keyhunt_delay_tracking; +float autocvar_g_balance_keyhunt_dropvelocity; +float autocvar_g_balance_keyhunt_maxdist; +float autocvar_g_balance_keyhunt_protecttime; + +int autocvar_g_balance_keyhunt_score_capture; +int autocvar_g_balance_keyhunt_score_carrierfrag; +int autocvar_g_balance_keyhunt_score_collect; +int autocvar_g_balance_keyhunt_score_destroyed; +int autocvar_g_balance_keyhunt_score_destroyed_ownfactor; +int autocvar_g_balance_keyhunt_score_push; +float autocvar_g_balance_keyhunt_throwvelocity; + int autocvar_g_keyhunt_point_leadlimit; bool autocvar_g_keyhunt_team_spawns; #define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit") @@ -1326,6 +1343,12 @@ MUTATOR_HOOKFUNCTION(kh, DropSpecialItems) return false; } +MUTATOR_HOOKFUNCTION(kh, reset_map_global) +{ + kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round + (game_starttime - time), kh_StartRound); + return false; +} + REGISTER_MUTATOR(kh, g_keyhunt) { ActivateTeamplay(); -- 2.39.2