r2720 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-28 18:20:02 -0400 (Mon, 28 May 2007)
New Revision: 2720

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
Log:
merge jumppad fix


Modified: branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2007-05-28 22:16:27 UTC (rev 2719)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2007-05-28 22:20:02 UTC (rev 2720)
@@ -129,8 +129,10 @@
 	{
 		if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
 		{
+			// flash when activated
+			te_smallflash(other.origin);
 			sound (other, CHAN_ITEM, "misc/jumppad.wav", 1, ATTN_NORM);
-			self.pushltime = time + 0.5;
+			self.pushltime = time + 0.2;
 		}
 		if(clienttype(other) == CLIENTTYPE_REAL)
 		{
@@ -167,8 +169,6 @@
 		self.think = SUB_Remove;
 		self.nextthink = time;
 	}
-	// flash when activated
-	te_smallflash(other.origin);
 };
 
 .vector dest;