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

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2010-01-23 05:04:31 -0500 (Sat, 23 Jan 2010)
New Revision: 8532

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/sv_main.qc
Log:
cvar switch for globally turning off selfdamage/falldamage in cts (independent from balance cfg #includes)


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2010-01-23 10:03:12 UTC (rev 8531)
+++ trunk/data/defaultNexuiz.cfg	2010-01-23 10:04:31 UTC (rev 8532)
@@ -569,6 +569,7 @@
 set g_rc_respawn_delay 0
 set g_cts_respawn_waves 0
 set g_cts_respawn_delay 0
+set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2010-01-23 10:03:12 UTC (rev 8531)
+++ trunk/data/qcsrc/server/g_damage.qc	2010-01-23 10:04:31 UTC (rev 8532)
@@ -799,7 +799,7 @@
 
 		if (targ == attacker)
 		{
-			if(g_ca)
+			if(g_ca || (g_cts && !cvar("g_cts_selfdamage")))
 				damage = 0;
 			else
 				damage = damage * cvar("g_balance_selfdamagepercent");	// Partial damage if the attacker hits himself

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2010-01-23 10:03:12 UTC (rev 8531)
+++ trunk/data/qcsrc/server/sv_main.qc	2010-01-23 10:04:31 UTC (rev 8532)
@@ -67,7 +67,7 @@
 				self.dmg = 2;
 			}
 			// check for falling damage
-			if(!self.hook.state && !g_ca)
+			if(!self.hook.state && !g_ca && !(g_cts && !cvar("g_cts_selfdamage")))
 			{
 				dm = vlen(self.oldvelocity) - vlen(self.velocity); // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
 				if (self.deadflag)