r6085 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-09 06:25:01 -0400 (Mon, 09 Mar 2009)
New Revision: 6085

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/g_damage.qc
Log:
fix typo in a cvar name


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-08 20:06:36 UTC (rev 6084)
+++ trunk/data/defaultNexuiz.cfg	2009-03-09 10:25:01 UTC (rev 6085)
@@ -490,7 +490,7 @@
 // common team values
 set g_tdm 0
 
-seta teamplay_defaul 4	"default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
+seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
 seta g_mirrordamage 0.3	"for teamplay 4: mirror damage factor"
 seta g_friendlyfire 0.1	"for teamplay 4: fiendly fire factor"
 seta g_teamdamage_threshold 50	"for teamplay 4: threshold over which to apply mirror damage"

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-03-08 20:06:36 UTC (rev 6084)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-03-09 10:25:01 UTC (rev 6085)
@@ -834,7 +834,7 @@
 		UpdateCSQCProjectile(self);
 	}
 	// apply damage
-	if (damage != 0)
+	if (damage != 0 || (self.damageforcescale && vlen(force)))
 	if (self.event_damage)
 		self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
 	self = oldself;