From 1316d1ad1f582a36d203d1eea1080bad2707e98c Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 11 Jun 2009 18:51:41 +0000 Subject: [PATCH] new cvar g_telefrags git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6986 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 4 +++- data/qcsrc/server/constants.qh | 2 +- data/qcsrc/server/t_teleporters.qc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 6ed3bb34b..a0c0872a4 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -24,7 +24,7 @@ alias if_dedicated "_detect_dedicated_$qport $*" 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 265422ea51f974b6529d2414fb9e9d75 +set cvar_check_default b502bb22b04d637eb4ea0d00cb934ff0 // Nexuiz version (formatted for machines) // used to determine if a client version is compatible @@ -284,6 +284,8 @@ set g_allow_oldnexbeam 0 "If enabled, clients are allowed to use old v2.3 Nexgun seta cl_particles_oldnexbeam 0 "Uses the old v2.3 Nexgun beam instead of the new beam, only works if server allows it (g_allow_oldnexbeam 1)" set sv_qcweaponanimation 0 +set g_telefrags 1 + // use default physics exec physics25.cfg diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index da1c46480..870554702 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,4 +1,4 @@ -string CVAR_CHECK_DEFAULT = "265422ea51f974b6529d2414fb9e9d75"; +string CVAR_CHECK_DEFAULT = "b502bb22b04d637eb4ea0d00cb934ff0"; string CVAR_CHECK_WEAPONS = "b0200324f7019e035dc04342c43d9628"; float FALSE = 0; diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc index daf6abbf6..9b2b94f6a 100644 --- a/data/qcsrc/server/t_teleporters.qc +++ b/data/qcsrc/server/t_teleporters.qc @@ -79,7 +79,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle if(player.classname == "player") { - if(player.takedamage && player.deadflag == DEAD_NO && !g_race) + if(player.takedamage && player.deadflag == DEAD_NO && !g_race && cvar("g_telefrags")) tdeath(player, teleporter, telefragger, telefragmin, telefragmax); // player no longer is on ground -- 2.39.2