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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Apr 25 04:51:15 EDT 2007


Author: div0
Date: 2007-04-25 04:51:15 -0400 (Wed, 25 Apr 2007)
New Revision: 2385

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


Modified: branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2007-04-25 08:50:51 UTC (rev 2384)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc	2007-04-25 08:51:15 UTC (rev 2385)
@@ -126,15 +126,16 @@
 	}
 
 	if (other.classname == "player")
+	{
+		if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
+		{
+			sound (other, CHAN_ITEM, "misc/jumppad.ogg", 1, ATTN_NORM);
+			self.pushltime = time + 0.5;
+		}
 		if(clienttype(other) == CLIENTTYPE_REAL)
 		{
 			local float i;
 			local float found;
-			if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
-			{
-				sound (other, CHAN_ITEM, "misc/jumppad.ogg", 1, ATTN_NORM);
-				self.pushltime = time + 0.5;
-			}
 			found = FALSE;
 			for(i = 0; i < other.jumppadcount && i < NUM_JUMPPADSUSED; ++i)
 				if(other.(jumppadsused[i]) == self)
@@ -147,6 +148,7 @@
 		}
 		else
 			other.jumppadcount = TRUE;
+	}
 
 	self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
 




More information about the nexuiz-commits mailing list