[nexuiz-commits] r7993 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-30 06:47:59 -0400 (Wed, 30 Sep 2009)
New Revision: 7993

Modified:
   trunk/data/qcsrc/server/w_common.qc
Log:
bullets: always network a force of at least 1 (fixes missing bullet holes in havoc)


Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-09-30 09:21:22 UTC (rev 7992)
+++ trunk/data/qcsrc/server/w_common.qc	2009-09-30 10:47:59 UTC (rev 7993)
@@ -187,7 +187,7 @@
 	f = pow(bound(0, vlen(self.velocity) / vlen(self.oldvelocity), 1), 2); // energy multiplier
 
 	if(other.solid == SOLID_BSP)
-		Damage_DamageInfo(self.origin, self.dmg * f, 0, 0, self.dmg_force * normalize(self.velocity) * f, self.projectiledeathtype, self);
+		Damage_DamageInfo(self.origin, self.dmg * f, 0, 0, max(1, self.dmg_force) * normalize(self.velocity) * f, self.projectiledeathtype, self);
 
 	if(other && other != self.enemy)
 	{
@@ -254,7 +254,7 @@
 	{
 		float f;
 		f = pow(bound(0, vlen(self.velocity) / vlen(self.oldvelocity), 1), 2); // energy multiplier
-		Damage_DamageInfo(self.origin, 0, 0, 0, self.dmg_force * normalize(self.velocity) * -f, self.projectiledeathtype, self);
+		Damage_DamageInfo(self.origin, 0, 0, 0, max(1, self.dmg_force) * normalize(self.velocity) * -f, self.projectiledeathtype, self);
 	}
 
 	UpdateCSQCProjectile(self);
@@ -512,7 +512,7 @@
 	{
 		pointparticles(particleeffectnum("TE_KNIGHTSPIKE"),end,trace_plane_normal * 2500,1);
 		if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
-			Damage_DamageInfo(trace_endpos, damage, 0, 0, dir * force, dtype, self);
+			Damage_DamageInfo(trace_endpos, damage, 0, 0, dir * max(1, force), dtype, self);
 		Damage (trace_ent, self, self, damage, dtype, trace_endpos, dir * force);
 		//void(float effectnum, vector org, vector vel, float howmany) pointparticles = #337; // same as in CSQC
 	}