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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-28 09:36:35 -0400 (Fri, 28 Aug 2009)
New Revision: 7548

Modified:
   trunk/data/qcsrc/server/t_jumppads.qc
Log:
jumppads: do not touch pushltime on non-players


Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc	2009-08-28 05:50:50 UTC (rev 7547)
+++ trunk/data/qcsrc/server/t_jumppads.qc	2009-08-28 13:36:35 UTC (rev 7548)
@@ -150,13 +150,16 @@
 		self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
 
 	other.flags &~= FL_ONGROUND;
-	// reset tracking of oldvelocity for impact damage (sudden velocity changes)
-	other.oldvelocity = other.velocity = self.movedir;
 
+	other.velocity = self.movedir;
+
 	UpdateCSQCProjectile(other);
 
 	if (other.classname == "player")
 	{
+		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
+		other.oldvelocity = other.velocity;
+
 		if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
 		{
 			// flash when activated
@@ -187,6 +190,9 @@
 			other.lastteleporttime = time;
 		else
 			other.jumppadcount = TRUE;
+
+		// reset tracking of who pushed you into a hazard (for kill credit)
+		other.pushltime = 0;
 	}
 
 	if(self.enemy.target)
@@ -199,9 +205,6 @@
 		self = oldself;
 	}
 
-	// reset tracking of who pushed you into a hazard (for kill credit)
-	other.pushltime = 0;
-
 	if (other.flags & FL_PROJECTILE)
 		other.angles = vectoangles (other.velocity);