r3000 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-12-06 04:21:33 -0500 (Thu, 06 Dec 2007)
New Revision: 3000

Modified:
   trunk/data/qcsrc/server/t_jumppads.qc
Log:
fix jumppad sound on targetless jumppads


Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc	2007-12-05 21:39:45 UTC (rev 2999)
+++ trunk/data/qcsrc/server/t_jumppads.qc	2007-12-06 09:21:33 UTC (rev 3000)
@@ -118,13 +118,6 @@
 	if (other.deadflag && other.classname == "player")
 		return;
 
-	if (!self.target)
-	{
-		other.velocity = self.movedir;
-		other.flags = other.flags - (other.flags & FL_ONGROUND);
-		return;
-	}
-
 	if (other.classname == "player")
 	{
 		if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
@@ -152,7 +145,8 @@
 			other.jumppadcount = TRUE;
 	}
 
-	self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+	if(self.target)
+		self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
 
 	other.flags = other.flags - (other.flags & FL_ONGROUND);
 	// reset tracking of oldvelocity for impact damage (sudden velocity changes)