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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-07 05:30:33 -0400 (Fri, 07 Aug 2009)
New Revision: 7378

Modified:
   trunk/data/qcsrc/server/cl_physics.qc
Log:
correctly apply friction_on_land to support Nexuiz 1.5 physics properly


Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-08-07 08:27:06 UTC (rev 7377)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-08-07 09:30:33 UTC (rev 7378)
@@ -92,6 +92,17 @@
 		mjumpheight = mjumpheight * cvar("g_minstagib_speed_jumpheight");
 	}
 
+	if(!(self.lastflags & FL_ONGROUND))
+	{
+		if(cvar("speedmeter"))
+			dprint(strcat("landing velocity: ", vtos(self.velocity), " (abs: ", ftos(vlen(self.velocity)), ")\n"));
+		if(self.lastground < time - 0.3)
+			self.velocity = self.velocity * (1 - cvar("sv_friction_on_land"));
+		if(self.jumppadcount > 1)
+			dprint(strcat(ftos(self.jumppadcount), "x jumppad combo\n"));
+		self.jumppadcount = 0;
+	}
+
 	self.velocity_z = self.velocity_z + mjumpheight;
 	self.oldvelocity_z = self.velocity_z;