From 5490c7e567040fbeb23963304502bf3ebcb32502 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 29 Nov 2009 14:03:22 +0000 Subject: [PATCH] fix SOME missing cvars git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8336 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/balance.cfg | 1 + data/balance25.cfg | 1 + data/balanceHavoc.cfg | 1 + data/balanceNexrun.cfg | 1 + data/balanceSamual.cfg | 1 + data/defaultNexuiz.cfg | 12 +++++++++++- data/qcsrc/server/cl_client.qc | 2 -- data/qcsrc/server/constants.qh | 2 +- data/qcsrc/server/t_items.qc | 10 ---------- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/data/balance.cfg b/data/balance.cfg index f1946eb5e..2216ef757 100644 --- a/data/balance.cfg +++ b/data/balance.cfg @@ -451,6 +451,7 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1 // }}} // {{{ porto set g_balance_porto_primary_refire 1.5 +set g_balance_porto_primary_animtime 0.3 set g_balance_porto_primary_speed 2000 set g_balance_porto_primary_lifetime 30 set g_balance_portal_health 200 // these get recharged whenever the portal is used diff --git a/data/balance25.cfg b/data/balance25.cfg index 98767edc9..c09c489d2 100644 --- a/data/balance25.cfg +++ b/data/balance25.cfg @@ -451,6 +451,7 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1 // }}} // {{{ porto set g_balance_porto_primary_refire 1.5 +set g_balance_porto_primary_animtime 0.3 set g_balance_porto_primary_speed 2000 set g_balance_porto_primary_lifetime 30 set g_balance_portal_health 200 // these get recharged whenever the portal is used diff --git a/data/balanceHavoc.cfg b/data/balanceHavoc.cfg index 81f064587..7a96c1fb2 100644 --- a/data/balanceHavoc.cfg +++ b/data/balanceHavoc.cfg @@ -451,6 +451,7 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1 // }}} // {{{ porto set g_balance_porto_primary_refire 1.5 +set g_balance_porto_primary_animtime 0.3 set g_balance_porto_primary_speed 2000 set g_balance_porto_primary_lifetime 30 set g_balance_portal_health 200 // these get recharged whenever the portal is used diff --git a/data/balanceNexrun.cfg b/data/balanceNexrun.cfg index 6121ae4f3..12d562c1a 100644 --- a/data/balanceNexrun.cfg +++ b/data/balanceNexrun.cfg @@ -452,6 +452,7 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1 // }}} // {{{ porto set g_balance_porto_primary_refire 1.5 +set g_balance_porto_primary_animtime 0.3 set g_balance_porto_primary_speed 5000 set g_balance_porto_primary_lifetime 30 set g_balance_portal_health 200 // these get recharged whenever the portal is used diff --git a/data/balanceSamual.cfg b/data/balanceSamual.cfg index 287cdcfea..cc156e319 100644 --- a/data/balanceSamual.cfg +++ b/data/balanceSamual.cfg @@ -452,6 +452,7 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1 // }}} // {{{ porto set g_balance_porto_primary_refire 1.5 +set g_balance_porto_primary_animtime 0.3 set g_balance_porto_primary_speed 5000 set g_balance_porto_primary_lifetime 30 set g_balance_portal_health 200 // these get recharged whenever the portal is used diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index cc054d3ab..f8698d0f1 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -26,7 +26,7 @@ if_dedicated alias if_client "" seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar) -set cvar_check_default 183061c914dc70b947ff76dfb9c52781 +set cvar_check_default 69623911fa2fbe35f109b546de468762 // Nexuiz version (formatted for machines) // used to determine if a client version is compatible @@ -507,6 +507,8 @@ seta capturelimit_override -1 "Capture limit overriding the mapinfo specified on seta captureleadlimit_override -1 "Capture llead imit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_ctf_capture_limit -1 "CTF capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_ctf_capture_leadlimit -1 "CTF capture lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" +seta g_arena_point_limit -1 "Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" +seta g_arena_point_leadlimit -1 "Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_domination_point_limit -1 "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_domination_point_leadlimit -1 "Domination point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_runematch_point_limit -1 "Runematch point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@ -1704,3 +1706,11 @@ set spawn_debugview 0 "display spawnpoints and their rating on spawn to debug sp set g_mutatormsg "" "mutator message" set speedmeter 0 "print landing speeds" set developer_shtest 0 "experimental speedhack detection" + +// debug cvars for keyhunt attaching +set _angles "0 0 0" +set _origin "0 0 0" + +// campaign internal, set when loading a campaign map1G +set _campaign_index "" +set _campaign_name "" diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 9fe9d7bff..e6028a8a4 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -892,8 +892,6 @@ void PutClientInServer (void) self.strength_finished = 0; self.invincible_finished = 0; self.pushltime = 0; - //self.speed_finished = 0; - //self.slowmo_finished = 0; // players have no think function self.think = SUB_Null; self.nextthink = 0; diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 1a9e41d8a..923230aa2 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,4 +1,4 @@ -string CVAR_CHECK_DEFAULT = "183061c914dc70b947ff76dfb9c52781"; +string CVAR_CHECK_DEFAULT = "69623911fa2fbe35f109b546de468762"; string CVAR_CHECK_BALANCE = "84d3d5976dd5870e8fc739c8f2a6451a"; float FALSE = 0; diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index f6831f3d8..f352eb712 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -419,16 +419,6 @@ float Item_GiveTo(entity item, entity player) pickedup = TRUE; player.invincible_finished = max(player.invincible_finished, time) + cvar("g_balance_powerup_invincible_time"); } - //if (item.speed_finished) - //{ - // pickedup = TRUE; - // player.speed_finished = max(player.speed_finished, time) + cvar("g_balance_powerup_speed_time"); - //} - //if (item.slowmo_finished) - //{ - // pickedup = TRUE; - // player.slowmo_finished = max(player.slowmo_finished, time) + (cvar("g_balance_powerup_slowmo_time") * cvar("g_balance_powerup_slowmo_speed")); - //} if (item.health) if (player.health < item.max_health) -- 2.39.2