[nexuiz-commits] r6986 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-11 14:51:41 -0400 (Thu, 11 Jun 2009)
New Revision: 6986

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/t_teleporters.qc
Log:
new cvar g_telefrags


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-06-11 18:48:26 UTC (rev 6985)
+++ trunk/data/defaultNexuiz.cfg	2009-06-11 18:51:41 UTC (rev 6986)
@@ -24,7 +24,7 @@
 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 @@
 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
 

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-06-11 18:48:26 UTC (rev 6985)
+++ trunk/data/qcsrc/server/constants.qh	2009-06-11 18:51:41 UTC (rev 6986)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "265422ea51f974b6529d2414fb9e9d75";
+string CVAR_CHECK_DEFAULT = "b502bb22b04d637eb4ea0d00cb934ff0";
 string CVAR_CHECK_WEAPONS = "b0200324f7019e035dc04342c43d9628";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc	2009-06-11 18:48:26 UTC (rev 6985)
+++ trunk/data/qcsrc/server/t_teleporters.qc	2009-06-11 18:51:41 UTC (rev 6986)
@@ -79,7 +79,7 @@
 
 	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